From fcbd732bac4462a0539e40a2dbb85c8832b36b0f Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:18:49 +0200 Subject: [PATCH 1/6] Remove branch alias Deps updated --- .idea/php.xml | 84 ++++----- .idea/plugin.iml | 83 ++++----- composer.json | 3 - composer.lock | 471 +++++++++++++++++++++++++++-------------------- 4 files changed, 355 insertions(+), 286 deletions(-) diff --git a/.idea/php.xml b/.idea/php.xml index b867b12..e9f7a1e 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -2,71 +2,73 @@ + + + + + + + + + + - - + - - - - - - - - + + + - - + - - - - - - - - - - + + - + + + + + - - - - - - - - + - - + + + - + + + + + + + + + - - - + + - + + + - - + + - + diff --git a/.idea/plugin.iml b/.idea/plugin.iml index 706385f..ee5f33c 100644 --- a/.idea/plugin.iml +++ b/.idea/plugin.iml @@ -5,71 +5,72 @@ + + + + + + + + + - - + - - - - - - - - + + + - - + - - - - - - - - - - + + - + + + + + - - - - - - - - + - - + + + - + + + + + + + + + - - - + + - + + + - - + + - + diff --git a/composer.json b/composer.json index d95fa88..49fb9e1 100644 --- a/composer.json +++ b/composer.json @@ -39,9 +39,6 @@ "include": [ "modules.local/*/composer.json" ] - }, - "branch-alias": { - "dev-initial": "0.1.x-dev" } } } diff --git a/composer.lock b/composer.lock index 45d1433..b84f054 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "238731453f941d4021408cdeeb844076", + "content-hash": "9798ced45721f2890c2f2651edcd90f5", "packages": [ { "name": "container-interop/service-provider", @@ -103,12 +103,12 @@ "source": { "type": "git", "url": "https://github.com/Dhii/containers.git", - "reference": "eaa5601e439a6f8bce998ab082bc7b90e6391c69" + "reference": "b76c73d172255eddb9d6e2a3a9ed2306c8b42563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/containers/zipball/eaa5601e439a6f8bce998ab082bc7b90e6391c69", - "reference": "eaa5601e439a6f8bce998ab082bc7b90e6391c69", + "url": "https://api.github.com/repos/Dhii/containers/zipball/b76c73d172255eddb9d6e2a3a9ed2306c8b42563", + "reference": "b76c73d172255eddb9d6e2a3a9ed2306c8b42563", "shasum": "" }, "require": { @@ -154,9 +154,9 @@ ], "support": { "issues": "https://github.com/Dhii/containers/issues", - "source": "https://github.com/Dhii/containers/tree/develop" + "source": "https://github.com/Dhii/containers/tree/v0.1.4-alpha2" }, - "time": "2021-03-10T08:53:06+00:00" + "time": "2021-03-10T08:54:31+00:00" }, { "name": "dhii/human-readable-interface", @@ -220,12 +220,12 @@ "source": { "type": "git", "url": "https://github.com/Dhii/module-interface.git", - "reference": "97a9a657a606216903af48b0f8b99a8c8ca99014" + "reference": "27cd6cacb5036ad16dffe6fab09fe5a528d7f3f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dhii/module-interface/zipball/97a9a657a606216903af48b0f8b99a8c8ca99014", - "reference": "97a9a657a606216903af48b0f8b99a8c8ca99014", + "url": "https://api.github.com/repos/Dhii/module-interface/zipball/27cd6cacb5036ad16dffe6fab09fe5a528d7f3f5", + "reference": "27cd6cacb5036ad16dffe6fab09fe5a528d7f3f5", "shasum": "" }, "require": { @@ -265,7 +265,7 @@ "issues": "https://github.com/Dhii/module-interface/issues", "source": "https://github.com/Dhii/module-interface/tree/develop" }, - "time": "2021-01-15T11:08:46+00:00" + "time": "2021-06-03T05:57:57+00:00" }, { "name": "dhii/package-interface", @@ -533,12 +533,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", "shasum": "" }, "require": { @@ -548,7 +548,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -593,7 +593,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" }, "funding": [ { @@ -609,7 +609,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "wikimedia/composer-merge-plugin", @@ -617,12 +617,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/composer-merge-plugin.git", - "reference": "1d8842fbcfa4bee69939ecedba24b0cb2cef9b24" + "reference": "47be3c0633f981937e4242c442e4faf5711a06e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/1d8842fbcfa4bee69939ecedba24b0cb2cef9b24", - "reference": "1d8842fbcfa4bee69939ecedba24b0cb2cef9b24", + "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/47be3c0633f981937e4242c442e4faf5711a06e7", + "reference": "47be3c0633f981937e4242c442e4faf5711a06e7", "shasum": "" }, "require": { @@ -664,20 +664,20 @@ "issues": "https://github.com/wikimedia/composer-merge-plugin/issues", "source": "https://github.com/wikimedia/composer-merge-plugin/tree/master" }, - "time": "2021-02-25T00:36:57+00:00" + "time": "2021-04-09T07:25:03+00:00" }, { "name": "wp-oop/wordpress-interface", - "version": "dev-task/initial-interfaces", + "version": "v0.1.0-alpha2", "source": { "type": "git", "url": "https://github.com/wp-oop/wordpress-interface.git", - "reference": "333cff0f154521c8924c80eb3dd390feaafe5c92" + "reference": "5e40acb49b76702f409bb5bcd2ea5459c9b946f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-oop/wordpress-interface/zipball/333cff0f154521c8924c80eb3dd390feaafe5c92", - "reference": "333cff0f154521c8924c80eb3dd390feaafe5c92", + "url": "https://api.github.com/repos/wp-oop/wordpress-interface/zipball/5e40acb49b76702f409bb5bcd2ea5459c9b946f5", + "reference": "5e40acb49b76702f409bb5bcd2ea5459c9b946f5", "shasum": "" }, "require": { @@ -714,9 +714,9 @@ "description": "Interfaces for interop within WordPress", "support": { "issues": "https://github.com/wp-oop/wordpress-interface/issues", - "source": "https://github.com/wp-oop/wordpress-interface/tree/task/initial-interfaces" + "source": "https://github.com/wp-oop/wordpress-interface/tree/v0.1.0-alpha2" }, - "time": "2021-03-05T17:12:02+00:00" + "time": "2021-04-30T09:37:37+00:00" } ], "packages-dev": [ @@ -816,12 +816,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "f813a658f0446192c5e17f96727070ee9342b93a" + "reference": "7a64a9ad336fc5e1e70b1c1fc1e9618a7027332e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/f813a658f0446192c5e17f96727070ee9342b93a", - "reference": "f813a658f0446192c5e17f96727070ee9342b93a", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/7a64a9ad336fc5e1e70b1c1fc1e9618a7027332e", + "reference": "7a64a9ad336fc5e1e70b1c1fc1e9618a7027332e", "shasum": "" }, "require": { @@ -886,7 +886,7 @@ "type": "github" } ], - "time": "2020-08-30T19:23:04+00:00" + "time": "2021-04-05T20:23:22+00:00" }, { "name": "composer/package-versions-deprecated", @@ -894,12 +894,12 @@ "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "f921205948ab93bb19f86327c793a81edb62f236" + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/f921205948ab93bb19f86327c793a81edb62f236", - "reference": "f921205948ab93bb19f86327c793a81edb62f236", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", "shasum": "" }, "require": { @@ -944,7 +944,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/master" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" }, "funding": [ { @@ -960,7 +960,7 @@ "type": "tidelift" } ], - "time": "2020-12-27T20:11:05+00:00" + "time": "2021-05-24T07:46:03+00:00" }, { "name": "composer/semver", @@ -968,12 +968,12 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "dd61cb4efbd0cff1700b217faf24ce596af4fc4e" + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/dd61cb4efbd0cff1700b217faf24ce596af4fc4e", - "reference": "dd61cb4efbd0cff1700b217faf24ce596af4fc4e", + "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", "shasum": "" }, "require": { @@ -1026,7 +1026,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/main" + "source": "https://github.com/composer/semver/tree/3.2.5" }, "funding": [ { @@ -1042,20 +1042,20 @@ "type": "tidelift" } ], - "time": "2020-12-10T07:55:43+00:00" + "time": "2021-05-24T12:41:47+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.4.5", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f28d44c286812c714741478d968104c5e604a1d4" + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", - "reference": "f28d44c286812c714741478d968104c5e604a1d4", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", "shasum": "" }, "require": { @@ -1063,7 +1063,8 @@ "psr/log": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "autoload": { @@ -1089,7 +1090,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.5" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" }, "funding": [ { @@ -1105,7 +1106,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:04:11+00:00" + "time": "2021-05-05T19:37:51+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -1285,20 +1286,20 @@ }, { "name": "felixfbecker/advanced-json-rpc", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e" + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e", - "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", "shasum": "" }, "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0", + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "php": "^7.1 || ^8.0", "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" }, @@ -1324,9 +1325,9 @@ "description": "A more advanced JSONRPC implementation", "support": { "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", - "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0" + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" }, - "time": "2021-01-10T17:48:47+00:00" + "time": "2021-06-11T22:34:44+00:00" }, { "name": "felixfbecker/language-server-protocol", @@ -1387,16 +1388,16 @@ }, { "name": "johnpbloch/wordpress-core", - "version": "5.7.0", + "version": "5.7.2", "source": { "type": "git", "url": "https://github.com/johnpbloch/wordpress-core.git", - "reference": "8b057056692ca196aaa7a7ddd915f29426922c6d" + "reference": "d0f5bdeb81800b6bcefee723ebf928b5677e2e86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/8b057056692ca196aaa7a7ddd915f29426922c6d", - "reference": "8b057056692ca196aaa7a7ddd915f29426922c6d", + "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/d0f5bdeb81800b6bcefee723ebf928b5677e2e86", + "reference": "d0f5bdeb81800b6bcefee723ebf928b5677e2e86", "shasum": "" }, "require": { @@ -1404,7 +1405,7 @@ "php": ">=5.6.20" }, "provide": { - "wordpress/core-implementation": "5.7.0" + "wordpress/core-implementation": "5.7.2" }, "type": "wordpress-core", "notification-url": "https://packagist.org/downloads/", @@ -1431,7 +1432,7 @@ "source": "https://core.trac.wordpress.org/browser", "wiki": "https://codex.wordpress.org/" }, - "time": "2021-03-09T20:32:23+00:00" + "time": "2021-05-13T00:40:25+00:00" }, { "name": "myclabs/deep-copy", @@ -1494,16 +1495,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v2.1.0", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e" + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e", - "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", "shasum": "" }, "require": { @@ -1511,10 +1512,10 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", - "php": ">=5.6" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -1539,22 +1540,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/master" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" }, - "time": "2020-04-16T18:48:43+00:00" + "time": "2020-12-01T19:48:11+00:00" }, { "name": "nikic/php-parser", - "version": "v4.10.4", + "version": "v4.10.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", "shasum": "" }, "require": { @@ -1595,9 +1596,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" }, - "time": "2020-12-20T10:01:03+00:00" + "time": "2021-05-03T19:11:20+00:00" }, { "name": "openlss/lib-array2xml", @@ -1824,12 +1825,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "f8d350d8514ff60b5993dd0121c62299480c989c" + "reference": "8719cc12e2a57ec3432a76989bb4ef773ac75b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f8d350d8514ff60b5993dd0121c62299480c989c", - "reference": "f8d350d8514ff60b5993dd0121c62299480c989c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8719cc12e2a57ec3432a76989bb4ef773ac75b63", + "reference": "8719cc12e2a57ec3432a76989bb4ef773ac75b63", "shasum": "" }, "require": { @@ -1873,7 +1874,7 @@ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" }, - "time": "2021-03-07T11:12:25+00:00" + "time": "2021-04-23T09:50:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1927,16 +1928,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.12.2", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "245710e971a030f42e08f4912863805570f23d39" + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39", - "reference": "245710e971a030f42e08f4912863805570f23d39", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", + "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", "shasum": "" }, "require": { @@ -1988,35 +1989,38 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.12.2" + "source": "https://github.com/phpspec/prophecy/tree/1.13.0" }, - "time": "2020-12-19T10:15:11+00:00" + "time": "2021-03-17T13:42:18+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "0.4.12", + "version": "0.4.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "2e17e4a90702d8b7ead58f4e08478a8e819ba6b8" + "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/2e17e4a90702d8b7ead58f4e08478a8e819ba6b8", - "reference": "2e17e4a90702d8b7ead58f4e08478a8e819ba6b8", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/98a088b17966bdf6ee25c8a4b634df313d8aa531", + "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "phing/phing": "^2.16.3", - "php-parallel-lint/php-parallel-lint": "^1.2", + "consistence/coding-standard": "^3.5", + "ergebnis/composer-normalize": "^2.0.2", + "jakub-onderka/php-parallel-lint": "^0.9.2", + "phing/phing": "^2.16.0", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.60", - "phpstan/phpstan-strict-rules": "^0.12.5", - "phpunit/phpunit": "^7.5.20", - "symfony/process": "^5.2" + "phpstan/phpstan": "^0.12.26", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^6.3", + "slevomat/coding-standard": "^4.7.2", + "symfony/process": "^4.0" }, "type": "library", "extra": { @@ -2038,9 +2042,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/0.4.12" + "source": "https://github.com/phpstan/phpdoc-parser/tree/master" }, - "time": "2021-02-28T14:30:10+00:00" + "time": "2020-08-03T20:32:43+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2345,12 +2349,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "4ac7d0b65f2c96e6dc6d11fd34a8c40c7261f7c8" + "reference": "0b7bdb98a2f9622e5d8739b118e005cf17b46502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ac7d0b65f2c96e6dc6d11fd34a8c40c7261f7c8", - "reference": "4ac7d0b65f2c96e6dc6d11fd34a8c40c7261f7c8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0b7bdb98a2f9622e5d8739b118e005cf17b46502", + "reference": "0b7bdb98a2f9622e5d8739b118e005cf17b46502", "shasum": "" }, "require": { @@ -2434,7 +2438,7 @@ "type": "github" } ], - "time": "2021-03-10T06:18:00+00:00" + "time": "2021-06-15T12:16:06+00:00" }, { "name": "psr/log", @@ -2442,12 +2446,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "a18c1e692e02b84abbafe4856c3cd7cc6903908c" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/a18c1e692e02b84abbafe4856c3cd7cc6903908c", - "reference": "a18c1e692e02b84abbafe4856c3cd7cc6903908c", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -2483,9 +2487,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/master" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2021-03-02T15:02:34+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -3218,34 +3222,33 @@ }, { "name": "slevomat/coding-standard", - "version": "dev-master", + "version": "6.4.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "a3e37268f8ed9f1cd2f74b876996cb2e91f3e1c4" + "reference": "696dcca217d0c9da2c40d02731526c1e25b65346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a3e37268f8ed9f1cd2f74b876996cb2e91f3e1c4", - "reference": "a3e37268f8ed9f1cd2f74b876996cb2e91f3e1c4", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/696dcca217d0c9da2c40d02731526c1e25b65346", + "reference": "696dcca217d0c9da2c40d02731526c1e25b65346", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.1 || ^8.0", - "phpstan/phpdoc-parser": "0.4.12", - "squizlabs/php_codesniffer": "dev-master" + "phpstan/phpdoc-parser": "0.4.5 - 0.4.9", + "squizlabs/php_codesniffer": "^3.5.6" }, "require-dev": { - "phing/phing": "2.16.4", + "phing/phing": "2.16.3", "php-parallel-lint/php-parallel-lint": "1.2.0", - "phpstan/phpstan": "0.12.80", - "phpstan/phpstan-deprecation-rules": "0.12.6", - "phpstan/phpstan-phpunit": "0.12.17", - "phpstan/phpstan-strict-rules": "0.12.9", - "phpunit/phpunit": "7.5.20|8.5.5|9.5.2" + "phpstan/phpstan": "0.12.48", + "phpstan/phpstan-deprecation-rules": "0.12.5", + "phpstan/phpstan-phpunit": "0.12.16", + "phpstan/phpstan-strict-rules": "0.12.5", + "phpunit/phpunit": "7.5.20|8.5.5|9.4.0" }, - "default-branch": true, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { @@ -3264,7 +3267,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/master" + "source": "https://github.com/slevomat/coding-standard/tree/6.4.1" }, "funding": [ { @@ -3276,7 +3279,7 @@ "type": "tidelift" } ], - "time": "2021-03-04T08:19:17+00:00" + "time": "2020-10-05T12:39:37+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -3284,12 +3287,12 @@ "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d02296fe420483999d2ad8cd8bdceb43014dc83e" + "reference": "9633c8abbf4d5e8ba08849a61b559812702b69ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d02296fe420483999d2ad8cd8bdceb43014dc83e", - "reference": "d02296fe420483999d2ad8cd8bdceb43014dc83e", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9633c8abbf4d5e8ba08849a61b559812702b69ca", + "reference": "9633c8abbf4d5e8ba08849a61b559812702b69ca", "shasum": "" }, "require": { @@ -3333,29 +3336,30 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-03-05T07:46:22+00:00" + "time": "2021-06-15T22:29:17+00:00" }, { "name": "symfony/console", - "version": "5.x-dev", + "version": "5.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4e102e4de39852a1dcd3b2169d263b88afee7fff" + "reference": "4411daa706a497da39b56619c0b2dbbe42b1fba3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4e102e4de39852a1dcd3b2169d263b88afee7fff", - "reference": "4e102e4de39852a1dcd3b2169d263b88afee7fff", + "url": "https://api.github.com/repos/symfony/console/zipball/4411daa706a497da39b56619c0b2dbbe42b1fba3", + "reference": "4411daa706a497da39b56619c0b2dbbe42b1fba3", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/string": "^5.1|^6.0" }, "conflict": { "symfony/dependency-injection": "<4.4", @@ -3369,12 +3373,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3382,7 +3386,6 @@ "symfony/lock": "", "symfony/process": "" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -3415,7 +3418,75 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/5.x" + "source": "https://github.com/symfony/console/tree/5.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-06-12T10:16:15+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "dev-main", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "36b691b0bdbc963fb610da193a48b4c009d03a62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/36b691b0bdbc963fb610da193a48b4c009d03a62", + "reference": "36b691b0bdbc963fb610da193a48b4c009d03a62", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/main" }, "funding": [ { @@ -3431,7 +3502,7 @@ "type": "tidelift" } ], - "time": "2021-03-08T21:52:55+00:00" + "time": "2021-06-09T13:36:38+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3439,12 +3510,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -3457,7 +3528,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3495,7 +3566,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" }, "funding": [ { @@ -3511,7 +3582,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -3519,12 +3590,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", "shasum": "" }, "require": { @@ -3537,7 +3608,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3577,7 +3648,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main" }, "funding": [ { @@ -3593,7 +3664,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -3601,12 +3672,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -3619,7 +3690,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3662,7 +3733,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" }, "funding": [ { @@ -3678,7 +3749,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3686,12 +3757,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -3704,7 +3775,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3743,7 +3814,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/main" }, "funding": [ { @@ -3759,7 +3830,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php73", @@ -3767,12 +3838,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { @@ -3782,7 +3853,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3823,7 +3894,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, "funding": [ { @@ -3839,20 +3910,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/service-contracts", - "version": "dev-main", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "96cd360b9f03a22a30cf5354e630c557bd3aac33" + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/96cd360b9f03a22a30cf5354e630c557bd3aac33", - "reference": "96cd360b9f03a22a30cf5354e630c557bd3aac33", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", "shasum": "" }, "require": { @@ -3862,7 +3933,6 @@ "suggest": { "symfony/service-implementation": "" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3903,7 +3973,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/main" + "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" }, "funding": [ { @@ -3919,20 +3989,20 @@ "type": "tidelift" } ], - "time": "2021-03-05T22:51:52+00:00" + "time": "2021-04-01T10:43:52+00:00" }, { "name": "symfony/string", - "version": "5.x-dev", + "version": "5.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "6d830fae00e2bb336074eae141bb00db36cd3551" + "reference": "92855c727d7edabe004605f451ef0b274fa24490" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/6d830fae00e2bb336074eae141bb00db36cd3551", - "reference": "6d830fae00e2bb336074eae141bb00db36cd3551", + "url": "https://api.github.com/repos/symfony/string/zipball/92855c727d7edabe004605f451ef0b274fa24490", + "reference": "92855c727d7edabe004605f451ef0b274fa24490", "shasum": "" }, "require": { @@ -3944,12 +4014,11 @@ "symfony/polyfill-php80": "~1.15" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -3987,7 +4056,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/5.x" + "source": "https://github.com/symfony/string/tree/5.4" }, "funding": [ { @@ -4003,7 +4072,7 @@ "type": "tidelift" } ], - "time": "2021-02-17T15:27:35+00:00" + "time": "2021-06-06T09:52:30+00:00" }, { "name": "theseer/tokenizer", @@ -4061,20 +4130,20 @@ "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "3c66b755e2468b0976979768972d298f4ba25651" + "reference": "e552925af6e42d38f1f70a6a1d620a3a94342c94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/3c66b755e2468b0976979768972d298f4ba25651", - "reference": "3c66b755e2468b0976979768972d298f4ba25651", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/e552925af6e42d38f1f70a6a1d620a3a94342c94", + "reference": "e552925af6e42d38f1f70a6a1d620a3a94342c94", "shasum": "" }, "require": { - "amphp/amp": "^2.1", + "amphp/amp": "^2.4.2", "amphp/byte-stream": "^1.5", "composer/package-versions-deprecated": "^1.8.0", "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.1", + "composer/xdebug-handler": "^1.1 || ^2.0", "dnoegel/php-xdg-base-dir": "^0.1.1", "ext-dom": "*", "ext-json": "*", @@ -4085,7 +4154,7 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.10.1", + "nikic/php-parser": "^4.10.5", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", @@ -4096,7 +4165,6 @@ "psalm/psalm": "self.version" }, "require-dev": { - "amphp/amp": "^2.4.2", "bamarni/composer-bin-plugin": "^1.2", "brianium/paratest": "^4.0||^6.0", "ext-curl": "*", @@ -4105,10 +4173,11 @@ "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^9.0", - "psalm/plugin-phpunit": "^0.13", - "slevomat/coding-standard": "^6.3.11", + "psalm/plugin-phpunit": "^0.16", + "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3", + "symfony/process": "^4.3 || ^5.0", + "weirdan/phpunit-appveyor-reporter": "^1.0.0", "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { @@ -4159,7 +4228,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm/tree/master" }, - "time": "2021-03-06T22:20:01+00:00" + "time": "2021-06-17T04:40:24+00:00" }, { "name": "webmozart/assert", @@ -4167,12 +4236,12 @@ "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "8403a941039e7a9534e877f0bb38b8d9faa48f01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/8403a941039e7a9534e877f0bb38b8d9faa48f01", + "reference": "8403a941039e7a9534e877f0bb38b8d9faa48f01", "shasum": "" }, "require": { @@ -4216,9 +4285,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/master" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2021-05-28T09:10:12+00:00" }, { "name": "webmozart/path-util", From 9674fa197f83da8e54dd9a608fd490f0a30fd76d Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:20:24 +0200 Subject: [PATCH 2/6] Discard changes on initial composer install --- docker/Dockerfile_wp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_wp b/docker/Dockerfile_wp index 15e4dcc..e0c603a 100644 --- a/docker/Dockerfile_wp +++ b/docker/Dockerfile_wp @@ -42,7 +42,7 @@ FROM build as vendor-dev ARG BUILD_ROOT_PATH WORKDIR ${BUILD_ROOT_PATH} -RUN composer install +RUN COMPOSER_DISCARD_CHANGES=true composer install # WordPress for development From 13d15aa4809b0a47f1c6ab135e90762c34b8b90c Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:23:56 +0200 Subject: [PATCH 3/6] Update deps Reconcile deps after merge --- composer.lock | 98 ++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/composer.lock b/composer.lock index b84f054..bce1603 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9798ced45721f2890c2f2651edcd90f5", + "content-hash": "9fd778b95b36fbcd5881becc55b711f1", "packages": [ { "name": "container-interop/service-provider", @@ -1386,54 +1386,6 @@ }, "time": "2021-02-22T14:02:09+00:00" }, - { - "name": "johnpbloch/wordpress-core", - "version": "5.7.2", - "source": { - "type": "git", - "url": "https://github.com/johnpbloch/wordpress-core.git", - "reference": "d0f5bdeb81800b6bcefee723ebf928b5677e2e86" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/d0f5bdeb81800b6bcefee723ebf928b5677e2e86", - "reference": "d0f5bdeb81800b6bcefee723ebf928b5677e2e86", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": ">=5.6.20" - }, - "provide": { - "wordpress/core-implementation": "5.7.2" - }, - "type": "wordpress-core", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "WordPress Community", - "homepage": "https://wordpress.org/about/" - } - ], - "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.", - "homepage": "https://wordpress.org/", - "keywords": [ - "blog", - "cms", - "wordpress" - ], - "support": { - "forum": "https://wordpress.org/support/", - "irc": "irc://irc.freenode.net/wordpress", - "issues": "https://core.trac.wordpress.org/", - "source": "https://core.trac.wordpress.org/browser", - "wiki": "https://codex.wordpress.org/" - }, - "time": "2021-05-13T00:40:25+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.x-dev", @@ -1765,6 +1717,50 @@ }, "time": "2021-02-23T14:00:09+00:00" }, + { + "name": "php-stubs/wordpress-stubs", + "version": "v5.7.2", + "source": { + "type": "git", + "url": "https://github.com/php-stubs/wordpress-stubs.git", + "reference": "beda02c58f1c4689d42c8dde6a84f7f0c9c93f42" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/beda02c58f1c4689d42c8dde6a84f7f0c9c93f42", + "reference": "beda02c58f1c4689d42c8dde6a84f7f0c9c93f42", + "shasum": "" + }, + "replace": { + "giacocorsiglia/wordpress-stubs": "*" + }, + "require-dev": { + "giacocorsiglia/stubs-generator": "^0.5.0", + "php": "~7.1" + }, + "suggest": { + "paragonie/sodium_compat": "Pure PHP implementation of libsodium", + "symfony/polyfill-php73": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "szepeviktor/phpstan-wordpress": "WordPress extensions for PHPStan" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "WordPress function and class declaration stubs for static analysis.", + "homepage": "https://github.com/php-stubs/wordpress-stubs", + "keywords": [ + "PHPStan", + "static analysis", + "wordpress" + ], + "support": { + "issues": "https://github.com/php-stubs/wordpress-stubs/issues", + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.7.2" + }, + "time": "2021-05-13T07:54:04+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "dev-master", @@ -4343,8 +4339,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "johnpbloch/wordpress-core": 0, - "webmozart/path-util": 0 + "webmozart/path-util": 0, + "php-stubs/wordpress-stubs": 0 }, "prefer-stable": false, "prefer-lowest": false, From 2e99ff1b96b4a03cb17161021b29db2653347a2b Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:25:54 +0200 Subject: [PATCH 4/6] Enable Psalm and PHPCS integrations for PHPStorm --- .idea/php.xml | 13 +++++++++++-- .idea/plugin.iml | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.idea/php.xml b/.idea/php.xml index e9f7a1e..7b6669c 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -1,5 +1,10 @@ + + + + + @@ -15,7 +20,6 @@ - @@ -70,6 +74,7 @@ + @@ -198,7 +203,11 @@ - + + + + + \ No newline at end of file diff --git a/.idea/plugin.iml b/.idea/plugin.iml index ee5f33c..2b03001 100644 --- a/.idea/plugin.iml +++ b/.idea/plugin.iml @@ -17,7 +17,6 @@ - @@ -72,6 +71,7 @@ + From 50a3eea9bbdcf8450bb3d1fb0c8b8fb49be9c1b1 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:28:31 +0200 Subject: [PATCH 5/6] Update readme --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3cde13b..1087a83 100644 --- a/README.md +++ b/README.md @@ -294,7 +294,8 @@ provide assistance during coding. docker-compose run --rm test vendor/bin/psalm ``` - Will also be run automatically on CI. + - Will also be run automatically on CI. + - PHPStorm [integration][phpstorm-psalm] included. - **PHPCS** @@ -305,9 +306,9 @@ provide assistance during coding. docker-compose run --rm test vendor/bin/phpcbf ``` - By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][]. - - Will also be run automatically on CI. + - By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][]. + - Will also be run automatically on CI. + - PHPStorm [integration][phpstorm-phpcs] included. [modularity]: https://dev.to/xedinunknown/cross-platform-modularity-in-php-30bo @@ -334,3 +335,5 @@ provide assistance during coding. [`xdebug.remote_host`]: https://xdebug.org/docs/all_settings#remote_host [`ModuleInterface`]: https://github.com/Dhii/module-interface/blob/develop/src/ModuleInterface.php [WI-54242]: https://youtrack.jetbrains.com/issue/WI-54242 +[phpstorm-psalm]: https://www.jetbrains.com/help/phpstorm/using-psalm.html +[phpstorm-phpcs]: https://www.jetbrains.com/help/phpstorm/using-php-code-sniffer.html From b9317c1c92f2901716f60a59cebdde8414e741e0 Mon Sep 17 00:00:00 2001 From: Anton Ukhanev Date: Thu, 17 Jun 2021 11:30:12 +0200 Subject: [PATCH 6/6] Remove deprecated attribute --- psalm.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/psalm.xml.dist b/psalm.xml.dist index 3bd490f..13ba449 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -10,7 +10,6 @@ strictBinaryOperands="true" rememberPropertyAssignmentsAfterCall="true" allowPhpStormGenerics="true" - allowCoercionFromStringToClassConst="false" allowStringToStandInForClass="false" memoizeMethodCallResults="false" hoistConstants="false"