Skip to content

Commit

Permalink
Update code fixing in dev, used libraries and laravel/framework to la…
Browse files Browse the repository at this point in the history
…test versions
  • Loading branch information
DariusIII committed May 7, 2019
1 parent e1938bc commit 9e9e2b6
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 69 deletions.
55 changes: 0 additions & 55 deletions .php-cs

This file was deleted.

21 changes: 21 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

require __DIR__.'/vendor/autoload.php';
require __DIR__.'/bootstrap/app.php';

return (new MattAllan\LaravelCodeStyle\Config())
->setFinder(
PhpCsFixer\Finder::create()
->in(app_path())
->in(config_path())
->in(database_path())
->notPath(database_path('migrations'))
->in(resource_path('lang'))
->in(base_path('routes'))
->in(base_path('tests'))
->in(base_path('Blacklight'))
->in(base_path('misc'))
)
->setRules([
'@Laravel' => true,
]);
2 changes: 2 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2019-05-07 DariusIII
* Chg: Update code fixing in dev, used libraries and laravel/framework to latest versions
2019-05-05 DariusIII
* Chg: Update pnotify to version 4.0.0 and tinyMCE to latest version
2019-05-03 DariusIII
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
"friendsofphp/php-cs-fixer": "^2.14",
"fzaninotto/faker": "~1.4",
"laracasts/generators": "dev-master",
"matt-allan/laravel-code-style": "^0.2.0",
"mockery/mockery": "^1.0",
"moontoast/math": "^1.1",
"nunomaduro/collision": "^3.0",
Expand Down Expand Up @@ -192,9 +193,8 @@
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"format": [
"vendor/bin/php-cs-fixer fix --config .php-cs"
]
"check-style": "php-cs-fixer fix --dry-run --diff",
"fix-style": "php-cs-fixer fix"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
Expand Down
81 changes: 70 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9e9e2b6

Please sign in to comment.