Update PHPCS and other dependencies.

This commit is contained in:
Dane Everitt 2017-11-05 13:33:42 -06:00
parent 82b7bff7f7
commit 30ab6ed692
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 266 additions and 146 deletions

View file

@ -24,6 +24,7 @@ return PhpCsFixer\Config::create()
'concat_space' => ['spacing' => 'one'], 'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'single'], 'declare_equal_normalize' => ['space' => 'single'],
'heredoc_to_nowdoc' => true, 'heredoc_to_nowdoc' => true,
'increment_style' => ['style' => 'post'],
'linebreak_after_opening_tag' => true, 'linebreak_after_opening_tag' => true,
'method_argument_space' => [ 'method_argument_space' => [
'ensure_fully_multiline' => false, 'ensure_fully_multiline' => false,
@ -45,4 +46,10 @@ return PhpCsFixer\Config::create()
'psr4' => true, 'psr4' => true,
'random_api_migration' => true, 'random_api_migration' => true,
'standardize_not_equals' => true, 'standardize_not_equals' => true,
'ternary_to_null_coalescing' => true,
'yoda_style' => [
'equal' => false,
'identical' => false,
'less_and_greater' => false,
]
])->setRiskyAllowed(true)->setFinder($finder); ])->setRiskyAllowed(true)->setFinder($finder);

View file

@ -99,7 +99,7 @@ class EnvironmentService
* *
* @return array * @return array
*/ */
final private function getEnvironmentMappings(): array private function getEnvironmentMappings(): array
{ {
return [ return [
'STARTUP' => 'startup', 'STARTUP' => 'startup',

View file

@ -46,7 +46,7 @@
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^2.4", "barryvdh/laravel-debugbar": "^2.4",
"barryvdh/laravel-ide-helper": "^2.4", "barryvdh/laravel-ide-helper": "^2.4",
"friendsofphp/php-cs-fixer": "~2.4.0", "friendsofphp/php-cs-fixer": "^2.4",
"fzaninotto/faker": "^1.6", "fzaninotto/faker": "^1.6",
"mockery/mockery": "^0.9", "mockery/mockery": "^0.9",
"php-mock/php-mock-phpunit": "^1.1", "php-mock/php-mock-phpunit": "^1.1",

395
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "416fbdc30098799c4403f9d05413b029", "content-hash": "3758867d4fb2d20e4b4e45b7c410f79b",
"packages": [ "packages": [
{ {
"name": "appstract/laravel-blade-directives", "name": "appstract/laravel-blade-directives",
@ -61,16 +61,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.36.0", "version": "3.36.37",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "69321675769dd3e3d00a94bfdc747bd3a5b75b3b" "reference": "a6d7fd9f32c63d018a6603a36174b4cb971fccd9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/69321675769dd3e3d00a94bfdc747bd3a5b75b3b", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a6d7fd9f32c63d018a6603a36174b4cb971fccd9",
"reference": "69321675769dd3e3d00a94bfdc747bd3a5b75b3b", "reference": "a6d7fd9f32c63d018a6603a36174b4cb971fccd9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -137,7 +137,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2017-09-01T22:52:38+00:00" "time": "2017-11-03T16:39:35+00:00"
}, },
{ {
"name": "christian-riesen/base32", "name": "christian-riesen/base32",
@ -1074,24 +1074,27 @@
}, },
{ {
"name": "hashids/hashids", "name": "hashids/hashids",
"version": "2.0.3", "version": "2.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ivanakimov/hashids.php.git", "url": "https://github.com/ivanakimov/hashids.php.git",
"reference": "28889ed83cdc91f4a55637daff0fb5c799eb324e" "reference": "7a945a5192d4a5c8888364970feece9bc26179df"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/28889ed83cdc91f4a55637daff0fb5c799eb324e", "url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/7a945a5192d4a5c8888364970feece9bc26179df",
"reference": "28889ed83cdc91f4a55637daff0fb5c799eb324e", "reference": "7a945a5192d4a5c8888364970feece9bc26179df",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-bcmath": "*",
"php": "^5.6.4 || ^7.0" "php": "^5.6.4 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.6" "phpunit/phpunit": "^5.7 || ^6.3"
},
"suggest": {
"ext-bcmatch": "Required to use BC Math arbitrary precision mathematics (*).",
"ext-gmp": "Required to use GNU multiple precision mathematics (*)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -1133,7 +1136,7 @@
"obfuscate", "obfuscate",
"youtube" "youtube"
], ],
"time": "2017-01-01T13:33:33+00:00" "time": "2017-10-28T11:24:20+00:00"
}, },
{ {
"name": "igaster/laravel-theme", "name": "igaster/laravel-theme",
@ -1676,16 +1679,16 @@
}, },
{ {
"name": "lord/laroute", "name": "lord/laroute",
"version": "2.4.5", "version": "2.4.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aaronlord/laroute.git", "url": "https://github.com/aaronlord/laroute.git",
"reference": "342af22147de90e02d5104447b7c5aea056b5548" "reference": "d40272a99b8996d7a09476fdff3c7a1c88dbebbc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aaronlord/laroute/zipball/342af22147de90e02d5104447b7c5aea056b5548", "url": "https://api.github.com/repos/aaronlord/laroute/zipball/d40272a99b8996d7a09476fdff3c7a1c88dbebbc",
"reference": "342af22147de90e02d5104447b7c5aea056b5548", "reference": "d40272a99b8996d7a09476fdff3c7a1c88dbebbc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1723,7 +1726,7 @@
"routes", "routes",
"routing" "routing"
], ],
"time": "2017-06-29T09:34:21+00:00" "time": "2017-09-04T02:25:29+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@ -1805,7 +1808,7 @@
}, },
{ {
"name": "mtdowling/cron-expression", "name": "mtdowling/cron-expression",
"version": "v1.2.0", "version": "v1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mtdowling/cron-expression.git", "url": "https://github.com/mtdowling/cron-expression.git",
@ -2003,16 +2006,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v3.1.1", "version": "v3.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a" "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a1e8e1a30e1352f118feff1a8481066ddc2f234a", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08131e7ff29de6bb9f12275c7d35df71f25f4d89",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a", "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2050,20 +2053,20 @@
"parser", "parser",
"php" "php"
], ],
"time": "2017-09-02T17:10:46+00:00" "time": "2017-11-04T11:48:34+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v2.0.10", "version": "v2.0.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2098,7 +2101,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2017-03-13T16:27:32+00:00" "time": "2017-09-27T21:40:39+00:00"
}, },
{ {
"name": "pragmarx/google2fa", "name": "pragmarx/google2fa",
@ -2360,16 +2363,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.8.11", "version": "v0.8.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0" "reference": "91e53c16560bdb8b9592544bb38429ae00d6baee"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/b193cd020e8c6b66cea6457826ae005e94e6d2c0", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/91e53c16560bdb8b9592544bb38429ae00d6baee",
"reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0", "reference": "91e53c16560bdb8b9592544bb38429ae00d6baee",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2429,20 +2432,20 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2017-07-29T19:30:02+00:00" "time": "2017-11-04T16:06:49+00:00"
}, },
{ {
"name": "ramsey/uuid", "name": "ramsey/uuid",
"version": "3.7.0", "version": "3.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ramsey/uuid.git", "url": "https://github.com/ramsey/uuid.git",
"reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e" "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/0ef23d1b10cf1bc576e9d865a7e9c47982c5715e", "url": "https://api.github.com/repos/ramsey/uuid/zipball/45cffe822057a09e05f7bd09ec5fb88eeecd2334",
"reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e", "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2511,7 +2514,7 @@
"identifier", "identifier",
"uuid" "uuid"
], ],
"time": "2017-08-04T13:39:04+00:00" "time": "2017-09-22T20:46:04+00:00"
}, },
{ {
"name": "s1lentium/iptools", "name": "s1lentium/iptools",
@ -2667,16 +2670,16 @@
}, },
{ {
"name": "spatie/fractalistic", "name": "spatie/fractalistic",
"version": "2.5.0", "version": "2.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/fractalistic.git", "url": "https://github.com/spatie/fractalistic.git",
"reference": "fdd536f8c1b172edfc3a742f6074680b80db2606" "reference": "f9e7fc7a5bbd3ef3dcc611612d656e0aad8b961e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/fractalistic/zipball/fdd536f8c1b172edfc3a742f6074680b80db2606", "url": "https://api.github.com/repos/spatie/fractalistic/zipball/f9e7fc7a5bbd3ef3dcc611612d656e0aad8b961e",
"reference": "fdd536f8c1b172edfc3a742f6074680b80db2606", "reference": "f9e7fc7a5bbd3ef3dcc611612d656e0aad8b961e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2685,7 +2688,7 @@
}, },
"require-dev": { "require-dev": {
"illuminate/pagination": "~5.3.0|~5.4.0", "illuminate/pagination": "~5.3.0|~5.4.0",
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7.21"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -2714,7 +2717,7 @@
"spatie", "spatie",
"transform" "transform"
], ],
"time": "2017-08-18T23:58:17+00:00" "time": "2017-09-08T08:26:54+00:00"
}, },
{ {
"name": "spatie/laravel-fractal", "name": "spatie/laravel-fractal",
@ -3269,16 +3272,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3290,7 +3293,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -3324,20 +3327,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14T15:44:48+00:00" "time": "2017-10-11T12:05:26+00:00"
}, },
{ {
"name": "symfony/polyfill-php56", "name": "symfony/polyfill-php56",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php56.git", "url": "https://github.com/symfony/polyfill-php56.git",
"reference": "e85ebdef569b84e8709864e1a290c40f156b30ca" "reference": "265fc96795492430762c29be291a371494ba3a5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e85ebdef569b84e8709864e1a290c40f156b30ca", "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/265fc96795492430762c29be291a371494ba3a5b",
"reference": "e85ebdef569b84e8709864e1a290c40f156b30ca", "reference": "265fc96795492430762c29be291a371494ba3a5b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3347,7 +3350,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -3380,20 +3383,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14T15:44:48+00:00" "time": "2017-10-11T12:05:26+00:00"
}, },
{ {
"name": "symfony/polyfill-util", "name": "symfony/polyfill-util",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-util.git", "url": "https://github.com/symfony/polyfill-util.git",
"reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d" "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/67925d1cf0b84bd234a83bebf26d4eb281744c6d", "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6e719200c8e540e0c0effeb31f96bdb344b94176",
"reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d", "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3402,7 +3405,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -3432,7 +3435,7 @@
"polyfill", "polyfill",
"shim" "shim"
], ],
"time": "2017-07-05T15:09:33+00:00" "time": "2017-10-11T12:05:26+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
@ -3793,16 +3796,16 @@
}, },
{ {
"name": "watson/validating", "name": "watson/validating",
"version": "3.0.2", "version": "3.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dwightwatson/validating.git", "url": "https://github.com/dwightwatson/validating.git",
"reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd" "reference": "ade13078bf2e820e244603446114a28eda51b08c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dwightwatson/validating/zipball/c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd", "url": "https://api.github.com/repos/dwightwatson/validating/zipball/ade13078bf2e820e244603446114a28eda51b08c",
"reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd", "reference": "ade13078bf2e820e244603446114a28eda51b08c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3839,7 +3842,7 @@
"laravel", "laravel",
"validation" "validation"
], ],
"time": "2017-08-25T02:12:38+00:00" "time": "2017-10-08T22:42:01+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
@ -3893,16 +3896,16 @@
}, },
{ {
"name": "webpatser/laravel-uuid", "name": "webpatser/laravel-uuid",
"version": "2.1.1", "version": "2.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webpatser/laravel-uuid.git", "url": "https://github.com/webpatser/laravel-uuid.git",
"reference": "317b835cf492240187e00673582e056ec4dc076a" "reference": "c87d5c631938edad7aae96d27881e3ea3de23d80"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webpatser/laravel-uuid/zipball/317b835cf492240187e00673582e056ec4dc076a", "url": "https://api.github.com/repos/webpatser/laravel-uuid/zipball/c87d5c631938edad7aae96d27881e3ea3de23d80",
"reference": "317b835cf492240187e00673582e056ec4dc076a", "reference": "c87d5c631938edad7aae96d27881e3ea3de23d80",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3943,7 +3946,7 @@
"keywords": [ "keywords": [
"UUID RFC4122" "UUID RFC4122"
], ],
"time": "2017-08-30T20:45:29+00:00" "time": "2017-09-10T21:34:32+00:00"
}, },
{ {
"name": "znck/belongs-to-through", "name": "znck/belongs-to-through",
@ -4170,6 +4173,68 @@
], ],
"time": "2016-06-13T19:28:20+00:00" "time": "2016-06-13T19:28:20+00:00"
}, },
{
"name": "composer/semver",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
"reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\Semver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nils Adermann",
"email": "naderman@naderman.de",
"homepage": "http://www.naderman.de"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
},
{
"name": "Rob Bast",
"email": "rob.bast@gmail.com",
"homepage": "http://robbast.nl"
}
],
"description": "Semver library that offers utilities, version constraint parsing and validation.",
"keywords": [
"semantic",
"semver",
"validation",
"versioning"
],
"time": "2016-08-30T16:08:34+00:00"
},
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
"version": "1.0.5", "version": "1.0.5",
@ -4226,44 +4291,46 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.4.1", "version": "v2.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "b4983586c8e7b1f99ec05dd1e75c8b673315da70" "reference": "89e7b083f27241e03dd776cb8d6781c77e341db6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b4983586c8e7b1f99ec05dd1e75c8b673315da70", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/89e7b083f27241e03dd776cb8d6781c77e341db6",
"reference": "b4983586c8e7b1f99ec05dd1e75c8b673315da70", "reference": "89e7b083f27241e03dd776cb8d6781c77e341db6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/semver": "^1.4",
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.2",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"gecko-packages/gecko-php-unit": "^2.0", "gecko-packages/gecko-php-unit": "^2.0 || ^3.0",
"php": "^5.6 || >=7.0 <7.2", "php": "^5.6 || >=7.0 <7.3",
"sebastian/diff": "^1.4", "php-cs-fixer/diff": "^1.2",
"symfony/console": "^3.0", "symfony/console": "^3.2 || ^4.0",
"symfony/event-dispatcher": "^3.0", "symfony/event-dispatcher": "^3.0 || ^4.0",
"symfony/filesystem": "^3.0", "symfony/filesystem": "^3.0 || ^4.0",
"symfony/finder": "^3.0", "symfony/finder": "^3.0 || ^4.0",
"symfony/options-resolver": "^3.0", "symfony/options-resolver": "^3.0 || ^4.0",
"symfony/polyfill-php70": "^1.0", "symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4", "symfony/polyfill-php72": "^1.4",
"symfony/process": "^3.0", "symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0" "symfony/stopwatch": "^3.0 || ^4.0"
}, },
"conflict": { "conflict": {
"hhvm": "*" "hhvm": "*"
}, },
"require-dev": { "require-dev": {
"johnkary/phpunit-speedtrap": "^1.1", "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.0",
"phpunit/phpunit": "^4.8.35 || ^5.4.3", "php-coveralls/php-coveralls": "^1.0.2",
"satooshi/php-coveralls": "^1.0", "php-cs-fixer/accessible-object": "^1.0",
"symfony/phpunit-bridge": "^3.2.2" "phpunit/phpunit": "^5.7.23 || ^6.4.3",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
}, },
"suggest": { "suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.", "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@ -4273,11 +4340,6 @@
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.4-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "PhpCsFixer\\": "src/"
@ -4305,7 +4367,7 @@
} }
], ],
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"time": "2017-08-22T14:11:01+00:00" "time": "2017-11-03T02:21:46+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
@ -4574,37 +4636,40 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.6.1", "version": "1.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.4.0" "php": "^5.6 || ^7.0"
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "1.*", "doctrine/collections": "^1.0",
"phpunit/phpunit": "~4.1" "doctrine/common": "^2.6",
"phpunit/phpunit": "^4.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"DeepCopy\\": "src/DeepCopy/" "DeepCopy\\": "src/DeepCopy/"
} },
"files": [
"src/DeepCopy/deep_copy.php"
]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
"description": "Create deep copies (clones) of your objects", "description": "Create deep copies (clones) of your objects",
"homepage": "https://github.com/myclabs/DeepCopy",
"keywords": [ "keywords": [
"clone", "clone",
"copy", "copy",
@ -4612,7 +4677,55 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2017-04-12T18:52:22+00:00" "time": "2017-10-19T19:58:43+00:00"
},
{
"name": "php-cs-fixer/diff",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
"reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.4.3",
"symfony/process": "^3.3"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"authors": [
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "SpacePossum"
}
],
"description": "sebastian/diff v2 backport support for PHP5.6",
"homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [
"diff"
],
"time": "2017-10-19T09:58:18+00:00"
}, },
{ {
"name": "php-mock/php-mock", "name": "php-mock/php-mock",
@ -4785,16 +4898,16 @@
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
"version": "1.0", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4835,20 +4948,20 @@
"reflection", "reflection",
"static analysis" "static analysis"
], ],
"time": "2015-12-27T11:43:31+00:00" "time": "2017-09-11T18:02:19+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "3.2.3", "version": "4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "86e24012a3139b42a7b71155cfaa325389f00f1f" "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/86e24012a3139b42a7b71155cfaa325389f00f1f", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
"reference": "86e24012a3139b42a7b71155cfaa325389f00f1f", "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4880,7 +4993,7 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-08-29T19:37:41+00:00" "time": "2017-08-30T18:51:59+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
@ -4931,22 +5044,22 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "v1.7.0", "version": "v1.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073" "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073", "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0", "php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0", "sebastian/comparator": "^1.1|^2.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0" "sebastian/recursion-context": "^1.0|^2.0|^3.0"
}, },
@ -4957,7 +5070,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6.x-dev" "dev-master": "1.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -4990,7 +5103,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2017-03-02T20:05:34+00:00" "time": "2017-09-04T11:05:03+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -5243,16 +5356,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "5.7.21", "version": "5.7.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78532d5269d984660080d8e0f4c99c5c2ea65ffe",
"reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5321,7 +5434,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-06-21T08:11:54+00:00" "time": "2017-10-15T06:13:55+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -6056,16 +6169,16 @@
}, },
{ {
"name": "symfony/polyfill-php70", "name": "symfony/polyfill-php70",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php70.git", "url": "https://github.com/symfony/polyfill-php70.git",
"reference": "b6482e68974486984f59449ecea1fbbb22ff840f" "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/b6482e68974486984f59449ecea1fbbb22ff840f", "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
"reference": "b6482e68974486984f59449ecea1fbbb22ff840f", "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6075,7 +6188,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -6111,20 +6224,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14T15:44:48+00:00" "time": "2017-10-11T12:05:26+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "8abc9097f5001d310f0edba727469c988acc6ea7" "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8abc9097f5001d310f0edba727469c988acc6ea7", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254",
"reference": "8abc9097f5001d310f0edba727469c988acc6ea7", "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6133,7 +6246,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.5-dev" "dev-master": "1.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -6166,7 +6279,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-07-11T13:25:55+00:00" "time": "2017-10-11T12:05:26+00:00"
}, },
{ {
"name": "symfony/stopwatch", "name": "symfony/stopwatch",

View file

@ -135,9 +135,9 @@ class SubuserControllerTest extends ControllerTestCase
$this->alert->shouldReceive('success')->with(trans('server.users.user_updated'))->once()->andReturnSelf(); $this->alert->shouldReceive('success')->with(trans('server.users.user_updated'))->once()->andReturnSelf();
$this->alert->shouldReceive('flash')->withNoArgs()->once()->andReturnNull(); $this->alert->shouldReceive('flash')->withNoArgs()->once()->andReturnNull();
$response = $controller->update($this->request, 'abcd1234', 1234); $response = $controller->update($this->request, 'abcd1234', $subuser->hashid);
$this->assertIsRedirectResponse($response); $this->assertIsRedirectResponse($response);
$this->assertRedirectRouteEquals('server.subusers.view', $response, ['uuid' => 'abcd1234', 'id' => 1234]); $this->assertRedirectRouteEquals('server.subusers.view', $response, ['uuid' => 'abcd1234', 'id' => $subuser->hashid]);
} }
/** /**
@ -183,7 +183,7 @@ class SubuserControllerTest extends ControllerTestCase
$this->assertIsRedirectResponse($response); $this->assertIsRedirectResponse($response);
$this->assertRedirectRouteEquals('server.subusers.view', $response, [ $this->assertRedirectRouteEquals('server.subusers.view', $response, [
'uuid' => $server->uuid, 'uuid' => $server->uuid,
'id' => $subuser->id, 'id' => $subuser->hashid,
]); ]);
} }