Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !6346

[php-laravel] Upgrade `php-laravel` to 7.x

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/dragonmantank/upgrade-php-laravel-7 into master 5 years ago
  • Overview 0
  • Commits 12
  • Pipelines 0
  • Changes 173

Created by: dragonmantank

This upgrade Laravel from 5.6 to 7.x. 5.6 is no longer supported. I updated the source code from the main laravel/laravel repository, and updated the supported files for new/missing files. I also updated the pet store examples.

See also #2562

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
Compare
  • master (base)

and
  • latest version
    c0e9893f
    12 commits, 2 years ago

173 files
+ 2000
- 1381

    Preferences

    File browser
    Compare changes
bin/c‎onfigs‎
php-lara‎vel.yaml‎ +4 -0
modules/openapi-g‎enerator/src/main‎
java/org/openapitoo‎ls/codegen/languages‎
PhpLaravelServ‎erCodegen.java‎ +26 -10
resources/‎php-laravel‎
a‎pp‎
Con‎sole‎
Kerne‎l.php‎ +1 -2
Excep‎tions‎
Handl‎er.php‎ +10 -6
Ht‎tp‎
Contr‎ollers‎
Control‎ler.php‎ +0 -13
Middl‎eware‎
Authenti‎cate.php‎ +21 -0
CheckForMaint‎enanceMode.php‎ +17 -0
RedirectIfAut‎henticated.php‎ +2 -1
TrustPro‎xies.php‎ +2 -2
Kerne‎l.php‎ +7 -4
Prov‎iders‎
AppServiceP‎rovider.php‎ +4 -4
AuthService‎Provider.php‎ +2 -2
BroadcastServi‎ceProvider.php‎ +1 -1
EventService‎Provider.php‎ +5 -3
RouteService‎Provider.php‎ +14 -6
User‎.php‎ +39 -0
boot‎strap‎
ca‎che‎
giti‎gnore‎ +1 -0
app‎.php‎ +1 -1
testingAu‎toload.php‎ +0 -6
con‎fig‎
app‎.php‎ +20 -2
auth‎.php‎ +15 -0
broadcas‎ting.php‎ +1 -1
cach‎e.php‎ +17 -7
cors‎.php‎ +34 -0
databa‎se.php‎ +31 -4
filesys‎tems.php‎ +17 -1
hashi‎ng.php‎ +1 -1
loggi‎ng.php‎ +24 -1
mail‎.php‎ +52 -65
queu‎e.php‎ +8 -5
servic‎es.php‎ +10 -15
sessi‎on.php‎ +13 -11
view‎.php‎ +4 -1
data‎base‎
fact‎ories‎
UserFac‎tory.php‎ +8 -3
migra‎tions‎
2014_10_12_000000_cr‎eate_users_table.php‎ +4 -3
2019_08_19_000000_creat‎e_failed_jobs_table.php‎ +35 -0
se‎eds‎
DatabaseS‎eeder.php‎ +1 -1
giti‎gnore‎ +1 -0
pub‎lic‎
c‎ss‎
app‎.css‎ +0 -6
j‎s‎
app‎.js‎ +0 -1
.hta‎ccess‎ +1 -1
web.c‎onfig‎ +5 -0
reso‎urces‎
ass‎ets‎
j‎s‎
compo‎nents‎
ExampleCom‎ponent.vue‎ +0 -23
app‎.js‎ +0 -22
sa‎ss‎
_variab‎les.scss‎ +0 -8
app.‎scss‎ +0 -14
j‎s‎
app‎.js‎ +1 -0
bootst‎rap.js‎ +28 -0
lan‎g/en‎
passwo‎rds.php‎ +3 -3
validat‎ion.php‎ +90 -85
sa‎ss‎
app.‎scss‎ +1 -0
vi‎ews‎
welcome.‎blade.php‎ +14 -9
rou‎tes‎
api.mu‎stache‎ +7 -0
channels‎.mustache‎ +2 -0
console.‎mustache‎ +3 -0
web.mu‎stache‎ +5 -1
storage/framew‎ork/cache/data‎
giti‎gnore‎ +2 -0
te‎sts‎
Fea‎ture‎
Example‎Test.php‎ +1 -1
Un‎it‎
Example‎Test.php‎ +1 -2
READ‎ME.md‎ +1 -1
composer‎.mustache‎ +48 -51
editor‎config‎ +15 -0
env.e‎xample‎ +12 -5
gitatt‎ributes‎ +5 -0
giti‎gnore‎ +13 -16
licenseInf‎o.mustache‎ +1 -1
packag‎e.json‎ +8 -9
phpun‎it.xml‎ +15 -18
style‎ci.yml‎ +13 -0
webpack‎.mix.js‎ +3 -3
samples/server/pe‎tstore/php-laravel‎
.openapi-‎generator‎
FI‎LES‎ +25 -19
l‎ib‎
a‎pp‎
Con‎sole‎
Kerne‎l.php‎ +1 -2
Excep‎tions‎
Handl‎er.php‎ +10 -6
Ht‎tp‎
Contr‎ollers‎
AnotherFakeC‎ontroller.php‎ +4 -4
Control‎ler.php‎ +0 -13
DefaultCon‎troller.php‎ +53 -0
FakeClassnameTags‎123Controller.php‎ +4 -4
FakeContr‎oller.php‎ +45 -22
PetContr‎oller.php‎ +7 -7
StoreCont‎roller.php‎ +4 -4
UserContr‎oller.php‎ +10 -10
Middl‎eware‎
Authenti‎cate.php‎ +21 -0
CheckForMaint‎enanceMode.php‎ +17 -0
RedirectIfAut‎henticated.php‎ +2 -1
TrustPro‎xies.php‎ +2 -2
Kerne‎l.php‎ +7 -4
Mod‎els‎
AdditionalPrope‎rtiesAnyType.php‎ +0 -15
AdditionalProp‎ertiesArray.php‎ +0 -15
AdditionalPrope‎rtiesBoolean.php‎ +0 -15
AdditionalProp‎ertiesClass.php‎ +4 -31
AdditionalPrope‎rtiesInteger.php‎ +0 -15
AdditionalPrope‎rtiesNumber.php‎ +0 -15
AdditionalPrope‎rtiesObject.php‎ +0 -15
AdditionalPrope‎rtiesString.php‎ +0 -15
BigCa‎t.php‎ +0 -24
EnumTe‎st.php‎ +9 -0
Foo‎.php‎ +15 -0
FormatT‎est.php‎ +5 -2
HealthChec‎kResult.php‎ +15 -0
InlineOb‎ject.php‎ +18 -0
InlineOb‎ject1.php‎ +18 -0
InlineOb‎ject2.php‎ +18 -0
InlineOb‎ject3.php‎ +54 -0
InlineOb‎ject4.php‎ +18 -0
InlineOb‎ject5.php‎ +18 -0
InlineRespon‎seDefault.php‎ +15 -0
Nullable‎Class.php‎ +48 -0
OuterEnumDef‎aultValue.php‎ +12 -0
OuterEnumI‎nteger.php‎ +12 -0
OuterEnumInteger‎DefaultValue.php‎ +12 -0
TypeHolder‎Default.php‎ +0 -27
TypeHolder‎Example.php‎ +0 -30
XmlIt‎em.php‎ +0 -99
Prov‎iders‎
AppServiceP‎rovider.php‎ +4 -4
AuthService‎Provider.php‎ +2 -2
BroadcastServi‎ceProvider.php‎ +1 -1
EventService‎Provider.php‎ +5 -3
RouteService‎Provider.php‎ +14 -6
RouteService‎Provider.php‎ +39 -0
boot‎strap‎
ca‎che‎
.giti‎gnore‎ +1 -0
app‎.php‎ +1 -1
testingAu‎toload.php‎ +0 -6
con‎fig‎
app‎.php‎ +20 -2
auth‎.php‎ +15 -0
broadcas‎ting.php‎ +1 -1
cach‎e.php‎ +17 -7
cors‎.php‎ +34 -0
databa‎se.php‎ +31 -4
filesys‎tems.php‎ +17 -1
hashi‎ng.php‎ +1 -1
loggi‎ng.php‎ +24 -1
mail‎.php‎ +52 -65
queu‎e.php‎ +8 -5
servic‎es.php‎ +10 -15
sessi‎on.php‎ +13 -11
view‎.php‎ +4 -1
data‎base‎
fact‎ories‎
UserFac‎tory.php‎ +8 -3
migra‎tions‎
2014_10_12_000000_cr‎eate_users_table.php‎ +4 -3
2019_08_19_000000_creat‎e_failed_jobs_table.php‎ +35 -0
se‎eds‎
DatabaseS‎eeder.php‎ +1 -1
.giti‎gnore‎ +1 -0
pub‎lic‎
c‎ss‎
app‎.css‎ +0 -6
j‎s‎
app‎.js‎ +0 -1
.hta‎ccess‎ +1 -1
web.c‎onfig‎ +5 -0
reso‎urces‎
ass‎ets‎
j‎s‎
compo‎nents‎
ExampleCom‎ponent.vue‎ +0 -23
app‎.js‎ +0 -21
bootst‎rap.js‎ +2 -30
sa‎ss‎
_variab‎les.scss‎ +0 -8
app.‎scss‎ +1 -14
lan‎g/en‎
passwo‎rds.php‎ +3 -3
validat‎ion.php‎ +90 -85
vi‎ews‎
welcome.‎blade.php‎ +13 -8
rou‎tes‎
api‎.php‎ +28 -7
channe‎ls.php‎ +3 -1
conso‎le.php‎ +4 -1
web‎.php‎ +6 -2
te‎sts‎
Fea‎ture‎
Example‎Test.php‎ +1 -1
Un‎it‎
Example‎Test.php‎ +1 -2
.edito‎rconfig‎ +15 -0
.e‎nv‎ +0 -39
.env.e‎xample‎ +12 -5
.gitatt‎ributes‎ +5 -0
.giti‎gnore‎ +16 -0
.style‎ci.yml‎ +13 -0
READ‎ME.md‎ +1 -1
compos‎er.json‎ +48 -51
packag‎e.json‎ +8 -9
phpun‎it.xml‎ +15 -18
webpack‎.mix.js‎ +3 -3
.giti‎gnore‎ +0 -19
pom‎.xml‎ +88 -0
pom‎.xml‎ +1 -0
bin/configs/php-laravel.yaml 0 → 100644
+ 4
- 0
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE

generatorName: php-laravel
outputDir: samples/server/petstore/php-laravel
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
templateDir: modules/openapi-generator/src/main/resources/php-laravel
bin/configs/php-laravel.yaml 0 → 100644
+ 4
- 0
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE

generatorName: php-laravel
outputDir: samples/server/petstore/php-laravel
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
templateDir: modules/openapi-generator/src/main/resources/php-laravel
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
+ 26
- 10
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -122,16 +122,17 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("package.json", outputFolder, "package.json"));
supportingFiles.add(new SupportingFile("phpunit.xml", outputFolder, "phpunit.xml"));
supportingFiles.add(new SupportingFile("webpack.mix.js", outputFolder, "webpack.mix.js"));
supportingFiles.add(new SupportingFile(".env.example", outputFolder, ".env.example"));
supportingFiles.add(new SupportingFile("editorconfig", outputFolder, ".editorconfig"));
supportingFiles.add(new SupportingFile("env.example", outputFolder, ".env.example"));
supportingFiles.add(new SupportingFile("gitattributes", outputFolder, ".gitattributes"));
supportingFiles.add(new SupportingFile("styleci.yml", outputFolder, ".styleci.yml"));
supportingFiles.add(new SupportingFile("server.php", outputFolder, "server.php"));
supportingFiles.add(new SupportingFile("gitignore", outputFolder, ".gitignore"));
supportingFiles.add(new SupportingFile("bootstrap/cache/gitignore", outputFolder + File.separator + "bootstrap" + File.separator + "cache", ".gitignore"));
supportingFiles.add(new SupportingFile("bootstrap/app.php", outputFolder + File.separator + "bootstrap", "app.php"));
supportingFiles.add(new SupportingFile("bootstrap/testingAutoload.php", outputFolder + File.separator + "bootstrap", "testingAutoload.php"));
/* /public/ */
supportingFiles.add(new SupportingFile("public/css/app.css", outputFolder + File.separator + "public" + File.separator + "css", "app.css"));
supportingFiles.add(new SupportingFile("public/js/app.js", outputFolder + File.separator + "public" + File.separator + "js", "app.js"));
supportingFiles.add(new SupportingFile("public/.htaccess", outputFolder + File.separator + "public", ".htaccess"));
supportingFiles.add(new SupportingFile("public/favicon.ico", outputFolder + File.separator + "public", "favicon.ico"));
supportingFiles.add(new SupportingFile("public/index.php", outputFolder + File.separator + "public", "index.php"));
@@ -147,6 +148,8 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
/* /app/Http/Controllers/ */
supportingFiles.add(new SupportingFile("app/Http/Kernel.php", outputFolder + File.separator + "app" + File.separator + "Http", "Kernel.php"));
supportingFiles.add(new SupportingFile("app/Http/Controllers/Controller.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Controllers", "Controller.php"));
supportingFiles.add(new SupportingFile("app/Http/Middleware/Authenticate.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "Authenticate.php"));
supportingFiles.add(new SupportingFile("app/Http/Middleware/CheckForMaintenanceMode.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "CheckForMaintenanceMode.php"));
supportingFiles.add(new SupportingFile("app/Http/Middleware/EncryptCookies.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "EncryptCookies.php"));
supportingFiles.add(new SupportingFile("app/Http/Middleware/RedirectIfAuthenticated.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "RedirectIfAuthenticated.php"));
supportingFiles.add(new SupportingFile("app/Http/Middleware/TrimStrings.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "TrimStrings.php"));
@@ -163,11 +166,13 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("app/Providers/BroadcastServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "BroadcastServiceProvider.php"));
supportingFiles.add(new SupportingFile("app/Providers/EventServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "EventServiceProvider.php"));
supportingFiles.add(new SupportingFile("app/Providers/RouteServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "RouteServiceProvider.php"));
// /app/
supportingFiles.add(new SupportingFile("app/User.php", outputFolder + File.separator + "app", "RouteServiceProvider.php"));
// /database/
supportingFiles.add(new SupportingFile("database/factories/UserFactory.php", outputFolder + File.separator + "database" + File.separator + "factories", "UserFactory.php"));
supportingFiles.add(new SupportingFile("database/migrations/2014_10_12_000000_create_users_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2014_10_12_000000_create_users_table.php"));
supportingFiles.add(new SupportingFile("database/migrations/2014_10_12_100000_create_password_resets_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2014_10_12_100000_create_password_resets_table.php"));
supportingFiles.add(new SupportingFile("database/migrations/2019_08_19_000000_create_failed_jobs_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2019_08_19_000000_create_failed_jobs_table.php"));
supportingFiles.add(new SupportingFile("database/seeds/DatabaseSeeder.php", outputFolder + File.separator + "database" + File.separator + "seeds", "DatabaseSeeder.php"));
supportingFiles.add(new SupportingFile("database/gitignore", outputFolder + File.separator + "database", ".gitignore"));
@@ -176,6 +181,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("config/auth.php", outputFolder + File.separator + "config", "auth.php"));
supportingFiles.add(new SupportingFile("config/broadcasting.php", outputFolder + File.separator + "config", "broadcasting.php"));
supportingFiles.add(new SupportingFile("config/cache.php", outputFolder + File.separator + "config", "cache.php"));
supportingFiles.add(new SupportingFile("config/cors.php", outputFolder + File.separator + "config", "cors.php"));
supportingFiles.add(new SupportingFile("config/database.php", outputFolder + File.separator + "config", "database.php"));
supportingFiles.add(new SupportingFile("config/filesystems.php", outputFolder + File.separator + "config", "filesystems.php"));
supportingFiles.add(new SupportingFile("config/hashing.php", outputFolder + File.separator + "config", "hashing.php"));
@@ -186,12 +192,13 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("config/session.php", outputFolder + File.separator + "config", "session.php"));
supportingFiles.add(new SupportingFile("config/view.php", outputFolder + File.separator + "config", "view.php"));
// /database/
supportingFiles.add(new SupportingFile("database/migrations/2019_08_19_000000_create_failed_jobs_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2019_08_19_000000_create_failed_jobs_table.php"));
// /resources/
supportingFiles.add(new SupportingFile("resources/assets/js/components/ExampleComponent.vue", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js" + File.separator + "components", "ExampleComponent.vue"));
supportingFiles.add(new SupportingFile("resources/assets/js/app.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "app.js"));
supportingFiles.add(new SupportingFile("resources/assets/js/bootstrap.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "bootstrap.js"));
supportingFiles.add(new SupportingFile("resources/assets/sass/_variables.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "_variables.scss"));
supportingFiles.add(new SupportingFile("resources/assets/sass/app.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "app.scss"));
supportingFiles.add(new SupportingFile("resources/js/app.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "app.js"));
supportingFiles.add(new SupportingFile("resources/js/bootstrap.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "bootstrap.js"));
supportingFiles.add(new SupportingFile("resources/sass/app.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "app.scss"));
supportingFiles.add(new SupportingFile("resources/lang/en/auth.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "auth.php"));
supportingFiles.add(new SupportingFile("resources/lang/en/pagination.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "pagination.php"));
supportingFiles.add(new SupportingFile("resources/lang/en/passwords.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "passwords.php"));
@@ -203,6 +210,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("storage/app/public/gitignore", outputFolder + File.separator + "storage" + File.separator + "app" + File.separator + "public", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/cache/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "cache", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/cache/data/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "cache", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/sessions/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "sessions", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/testing/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "testing", ".gitignore"));
supportingFiles.add(new SupportingFile("storage/framework/views/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "views", ".gitignore"));
@@ -215,6 +223,14 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
supportingFiles.add(new SupportingFile("tests/TestCase.php", outputFolder + File.separator + "tests", "TestCase.php"));
}
@Override
public void processOpts() {
super.processOpts();
// remove gitignore supporting file from AbstractPhpCodegen
supportingFiles.remove(supportingFiles.size() - 1);
}
// override with any special post-processing
@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
modules/openapi-generator/src/main/resources/php-laravel/app/Console/Kernel.php
+ 1
- 2
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
// $schedule->command('inspire')
// ->hourly();
// $schedule->command('inspire')->hourly();
}
/**
modules/openapi-generator/src/main/resources/php-laravel/app/Exceptions/Handler.php
+ 10
- 6
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,8 +2,8 @@
namespace App\Exceptions;
use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{
@@ -29,10 +29,12 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param \Exception $exception
* @param \Throwable $exception
* @return void
*
* @throws \Exception
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
@@ -41,10 +43,12 @@ class Handler extends ExceptionHandler
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
* @param \Throwable $exception
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Throwable
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
return parent::render($request, $exception);
}
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Controllers/Controller.php
+ 0
- 13
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -7,20 +7,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
/**
* Class Controller
*
* @package App\Http\Controllers
*/
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
/**
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function welcome()
{
return view('welcome');
}
}
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/Authenticate.php 0 → 100644
+ 21
- 0
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE

<?php
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
class Authenticate extends Middleware
{
/**
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @return string|null
*/
protected function redirectTo($request)
{
if (! $request->expectsJson()) {
return route('login');
}
}
}
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/CheckForMaintenanceMode.php 0 → 100644
+ 17
- 0
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE

<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
class CheckForMaintenanceMode extends Middleware
{
/**
* The URIs that should be reachable while maintenance mode is enabled.
*
* @var array
*/
protected $except = [
//
];
}
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/RedirectIfAuthenticated.php
+ 2
- 1
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,6 +2,7 @@
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Support\Facades\Auth;
@@ -18,7 +19,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/home');
return redirect(RouteServiceProvider::HOME);
}
return $next($request);
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/TrustProxies.php
+ 2
- 2
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,15 +2,15 @@
namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
* @var array|string|null
*/
protected $proxies;
modules/openapi-generator/src/main/resources/php-laravel/app/Http/Kernel.php
+ 7
- 4
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -14,11 +14,12 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
];
/**
@@ -39,7 +40,7 @@ class Kernel extends HttpKernel
'api' => [
'throttle:60,1',
'bindings',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
];
@@ -51,13 +52,15 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
];
}
modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AppServiceProvider.php
+ 4
- 4
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -7,21 +7,21 @@ use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
* Register any application services.
*
* @return void
*/
public function boot()
public function register()
{
//
}
/**
* Register any application services.
* Bootstrap any application services.
*
* @return void
*/
public function register()
public function boot()
{
//
}
modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AuthServiceProvider.php
+ 2
- 2
  • View file @ c0e9893f

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Gate;
class AuthServiceProvider extends ServiceProvider
{
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
// 'App\Model' => 'App\Policies\ModelPolicy',
];
/**
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
3
Breaking change (without fallback) Enhancement: Compatibility Server: PHP
3
Breaking change (without fallback) Enhancement: Compatibility Server: PHP
    Assign labels
  • Manage project labels

Milestone
5.0.0
5.0.0 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
Administrator
Reference: OpenAPITools/openapi-generator!6346
Source branch: github/fork/dragonmantank/upgrade-php-laravel-7

Menu

Explore Projects Groups Snippets