diff --git a/.github/workflows/release-phar.yml b/.github/workflows/release-phar.yml index a56cf9356..347c506b5 100644 --- a/.github/workflows/release-phar.yml +++ b/.github/workflows/release-phar.yml @@ -8,7 +8,7 @@ name: Append phalcon.phar to release jobs: build: name: Compile and upload Phar - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -17,7 +17,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.4' - extensions: phalcon-5.1.2 + extensions: phalcon-5.4.0 - name: Compile phalcon.phar run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d8ba8fe40..f3857d64a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest env: - extensions: mbstring, intl, json, zip, phalcon-5.2.0, mysql, pgsql, xdebug-2.9.8 + extensions: mbstring, intl, json, zip, phalcon-5.4.0, mysql, pgsql, xdebug-2.9.8 key: cache-v2.0~19.03.2020 services: @@ -34,7 +34,7 @@ jobs: matrix: php-versions: [ '7.4', '8.0', '8.1', '8.2' ] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Setup cache environment id: cache-env diff --git a/README.md b/README.md index b1a316593..62d9015c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ with Phalcon framework. ## Requirements -* PHP >= 7.4.1 +* PHP >= 7.4.1 <8.3 * Phalcon >= 5.0.0 ## Installing via Composer diff --git a/composer.json b/composer.json index 6b7218ca6..7306ab14a 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,8 @@ "phalcon", "devtools", "webtools", - "phar" + "phar", + "dev" ], "homepage": "https://phalcon.io", "license": "BSD-3-Clause", @@ -32,7 +33,7 @@ "sort-packages": true }, "require": { - "php": "^7.4||~8.0||~8.1||~8.2||~8.3", + "php": "^7.4||~8.0||~8.1||~8.2", "ext-pdo": "*", "ext-phalcon": "^5.0.0", "psy/psysh": "~0.9", diff --git a/composer.lock b/composer.lock index ebb817999..e8099c525 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": "a1fd3ae348b341cfee13d399ab740635", + "content-hash": "868c244dbeda0c5d5435e8ea952032c9", "packages": [ { "name": "composer/package-versions-deprecated", @@ -731,16 +731,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.9.3", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", "shasum": "" }, "require": { @@ -748,7 +748,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" + "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34" }, "type": "library", "extra": { @@ -790,7 +790,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.4" }, "funding": [ { @@ -802,7 +802,7 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:41:07+00:00" + "time": "2025-08-21T11:53:16+00:00" }, { "name": "psr/container", @@ -904,16 +904,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.7", + "version": "v0.12.14", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" + "reference": "95c29b3756a23855a30566b745d218bee690bef2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", - "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/95c29b3756a23855a30566b745d218bee690bef2", + "reference": "95c29b3756a23855a30566b745d218bee690bef2", "shasum": "" }, "require": { @@ -928,11 +928,12 @@ "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2" + "bamarni/composer-bin-plugin": "^1.2", + "composer/class-map-generator": "^1.6" }, "suggest": { + "composer/class-map-generator": "Improved tab completion performance with better class discovery.", "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ @@ -963,12 +964,11 @@ "authors": [ { "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" + "email": "justin@justinhileman.info" } ], "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", + "homepage": "https://psysh.org", "keywords": [ "REPL", "console", @@ -977,9 +977,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.14" }, - "time": "2024-12-10T01:58:33+00:00" + "time": "2025-10-27T17:15:31+00:00" }, { "name": "symfony/console", @@ -1358,7 +1358,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1417,7 +1417,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -1428,6 +1428,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -1437,16 +1441,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -1495,7 +1499,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -1506,16 +1510,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1576,7 +1584,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -1587,6 +1595,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -1596,19 +1608,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -1656,7 +1669,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -1667,25 +1680,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", "shasum": "" }, "require": { @@ -1736,7 +1753,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" }, "funding": [ { @@ -1747,16 +1764,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-01-02T08:10:11+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -1812,7 +1833,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" }, "funding": [ { @@ -1823,6 +1844,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -2229,16 +2254,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2" + "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2", - "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af", + "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af", "shasum": "" }, "require": { @@ -2297,7 +2322,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2" }, "funding": [ { @@ -2309,32 +2334,32 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:52:34+00:00" + "time": "2025-04-30T23:37:27+00:00" }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -2365,24 +2390,24 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.1" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-29T15:56:20+00:00" } ], "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.4", + "version": "v2.6.5", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "url": "https://api.github.com/repos/amphp/amp/zipball/d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", "shasum": "" }, "require": { @@ -2398,11 +2423,6 @@ "vimeo/psalm": "^3.12" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php", @@ -2450,7 +2470,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.4" + "source": "https://github.com/amphp/amp/tree/v2.6.5" }, "funding": [ { @@ -2458,7 +2478,7 @@ "type": "github" } ], - "time": "2024-03-21T18:52:26+00:00" + "time": "2025-09-03T19:41:28+00:00" }, { "name": "amphp/byte-stream", @@ -2533,16 +2553,16 @@ }, { "name": "amphp/parallel", - "version": "v1.4.3", + "version": "v1.4.4", "source": { "type": "git", "url": "https://github.com/amphp/parallel.git", - "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0" + "reference": "508ca221f2f47235327db5120f0a89d43435b69b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/parallel/zipball/3aac213ba7858566fd83d38ccb85b91b2d652cb0", - "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0", + "url": "https://api.github.com/repos/amphp/parallel/zipball/508ca221f2f47235327db5120f0a89d43435b69b", + "reference": "508ca221f2f47235327db5120f0a89d43435b69b", "shasum": "" }, "require": { @@ -2555,9 +2575,9 @@ "php": ">=7.1" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", + "amphp/php-cs-fixer-config": "^2", "amphp/phpunit-util": "^1.1", - "phpunit/phpunit": "^8 || ^7" + "phpunit/phpunit": "^9 || ^8 || ^7" }, "type": "library", "autoload": { @@ -2595,7 +2615,7 @@ ], "support": { "issues": "https://github.com/amphp/parallel/issues", - "source": "https://github.com/amphp/parallel/tree/v1.4.3" + "source": "https://github.com/amphp/parallel/tree/v1.4.4" }, "funding": [ { @@ -2603,7 +2623,7 @@ "type": "github" } ], - "time": "2023-03-23T08:04:23+00:00" + "time": "2024-12-08T16:28:11+00:00" }, { "name": "amphp/parallel-functions", @@ -3454,6 +3474,7 @@ "issues": "https://github.com/Codeception/phpunit-wrapper/issues", "source": "https://github.com/Codeception/phpunit-wrapper/tree/9.0.9" }, + "abandoned": true, "time": "2022-05-23T06:24:11+00:00" }, { @@ -3671,16 +3692,16 @@ }, { "name": "composer/semver", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95", "shasum": "" }, "require": { @@ -3732,7 +3753,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.3" + "source": "https://github.com/composer/semver/tree/3.4.4" }, "funding": [ { @@ -3742,13 +3763,9 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2024-09-19T14:15:21+00:00" + "time": "2025-08-20T19:15:30+00:00" }, { "name": "composer/xdebug-handler", @@ -3855,26 +3872,29 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, + "conflict": { + "phpunit/phpunit": "<=7.5 || >=13" + }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "1.4.10 || 2.0.3", + "doctrine/coding-standard": "^9 || ^12 || ^13", + "phpstan/phpstan": "1.4.10 || 2.1.11", "phpstan/phpstan-phpunit": "^1.0 || ^2", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", "psr/log": "^1 || ^2 || ^3" }, "suggest": { @@ -3894,9 +3914,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.4" + "source": "https://github.com/doctrine/deprecations/tree/1.1.5" }, - "time": "2024-12-07T21:18:45+00:00" + "time": "2025-04-07T20:06:18+00:00" }, { "name": "doctrine/instantiator", @@ -4071,22 +4091,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.2", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.3", - "guzzlehttp/psr7": "^2.7.0", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -4177,7 +4197,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.2" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -4193,20 +4213,20 @@ "type": "tidelift" } ], - "time": "2024-07-24T11:22:20+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.4", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { @@ -4214,7 +4234,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", "extra": { @@ -4260,7 +4280,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.4" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -4276,20 +4296,20 @@ "type": "tidelift" } ], - "time": "2024-10-17T10:06:22+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -4305,7 +4325,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -4376,7 +4396,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.0" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -4392,7 +4412,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T11:15:46+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "humbug/box", @@ -4620,16 +4640,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.0", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -4668,7 +4688,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -4676,7 +4696,7 @@ "type": "tidelift" } ], - "time": "2025-02-12T12:17:51+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "netresearch/jsonmapper", @@ -4836,16 +4856,16 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.7.0", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105" + "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", - "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/e30811f7bc69e4b5b6d5783e712c06c8eabf0226", + "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226", "shasum": "" }, "require": { @@ -4899,7 +4919,7 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2024-05-08T12:18:48+00:00" + "time": "2025-09-24T15:12:37+00:00" }, { "name": "paragonie/pharaoh", @@ -5014,16 +5034,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.21.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37" + "reference": "b938a5c6844d222a26d46a6c7b80291e4cd8cfab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37", - "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/b938a5c6844d222a26d46a6c7b80291e4cd8cfab", + "reference": "b938a5c6844d222a26d46a6c7b80291e4cd8cfab", "shasum": "" }, "require": { @@ -5094,9 +5114,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1" + "source": "https://github.com/paragonie/sodium_compat/tree/v1.23.0" }, - "time": "2024-04-22T22:05:04+00:00" + "time": "2025-10-06T08:53:07+00:00" }, { "name": "phar-io/manifest", @@ -5271,16 +5291,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.1", + "version": "5.6.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94f8051919d1b0369a6bcc7931d679a511c03fe9", + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9", "shasum": "" }, "require": { @@ -5329,9 +5349,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.3" }, - "time": "2024-12-07T09:39:29+00:00" + "time": "2025-08-01T19:43:32+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5393,16 +5413,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", "shasum": "" }, "require": { @@ -5434,9 +5454,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/2.1.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" }, - "time": "2025-02-19T13:28:12+00:00" + "time": "2025-08-30T15:50:23+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5759,16 +5779,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.22", + "version": "9.6.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" + "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", - "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", + "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", "shasum": "" }, "require": { @@ -5779,7 +5799,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.1", + "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -5790,11 +5810,11 @@ "phpunit/php-timer": "^5.0.3", "sebastian/cli-parser": "^1.0.2", "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.8", + "sebastian/comparator": "^4.0.9", "sebastian/diff": "^4.0.6", "sebastian/environment": "^5.1.5", - "sebastian/exporter": "^4.0.6", - "sebastian/global-state": "^5.0.7", + "sebastian/exporter": "^4.0.8", + "sebastian/global-state": "^5.0.8", "sebastian/object-enumerator": "^4.0.4", "sebastian/resource-operations": "^3.0.4", "sebastian/type": "^3.2.1", @@ -5842,7 +5862,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29" }, "funding": [ { @@ -5853,12 +5873,20 @@ "url": "https://github.com/sebastianbergmann", "type": "github" }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" } ], - "time": "2024-12-05T13:48:26+00:00" + "time": "2025-09-24T06:29:11+00:00" }, { "name": "psr/http-client", @@ -6283,16 +6311,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "4.0.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5", + "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5", "shasum": "" }, "require": { @@ -6345,15 +6373,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2025-08-10T06:51:50+00:00" }, { "name": "sebastian/complexity", @@ -6543,16 +6583,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" + "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", - "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c", + "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c", "shasum": "" }, "require": { @@ -6608,28 +6648,40 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-03-02T06:33:00+00:00" + "time": "2025-09-24T06:03:27+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.7", + "version": "5.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" + "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", - "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6", + "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6", "shasum": "" }, "require": { @@ -6672,15 +6724,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state", + "type": "tidelift" } ], - "time": "2024-03-02T06:35:11+00:00" + "time": "2025-08-10T07:10:35+00:00" }, { "name": "sebastian/lines-of-code", @@ -6853,16 +6917,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + "reference": "539c6691e0623af6dc6f9c20384c120f963465a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0", + "reference": "539c6691e0623af6dc6f9c20384c120f963465a0", "shasum": "" }, "require": { @@ -6904,15 +6968,27 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2023-02-03T06:07:39+00:00" + "time": "2025-08-10T06:57:39+00:00" }, { "name": "sebastian/resource-operations", @@ -7143,16 +7219,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.3", + "version": "3.13.4", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10" + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", - "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", "shasum": "" }, "require": { @@ -7219,11 +7295,11 @@ "type": "open_collective" }, { - "url": "https://thanks.dev/phpcsstandards", + "url": "https://thanks.dev/u/gh/phpcsstandards", "type": "thanks_dev" } ], - "time": "2025-01-23T17:04:15+00:00" + "time": "2025-09-05T05:47:09+00:00" }, { "name": "symfony/browser-kit", @@ -7926,7 +8002,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4||~8.0||~8.1||~8.2||~8.3", + "php": "^7.4||~8.0||~8.1||~8.2", "ext-pdo": "*", "ext-phalcon": "^5.0.0" }, diff --git a/src/Access/Manager.php b/src/Access/Manager.php index a843641a9..1c9ec8531 100644 --- a/src/Access/Manager.php +++ b/src/Access/Manager.php @@ -46,11 +46,11 @@ public function __construct(PolicyInterface $policy) * * @param Event $event Event object. * @param Dispatcher $dispatcher Dispatcher object. - * @param array $data Data. + * @param array|null $data Data. * * @return mixed */ - public function beforeDispatch(Event $event, Dispatcher $dispatcher, array $data = null) + public function beforeDispatch(Event $event, Dispatcher $dispatcher, ?array $data = null) { $controller = $dispatcher->getControllerName(); @@ -72,10 +72,10 @@ public function beforeDispatch(Event $event, Dispatcher $dispatcher, array $data * Checks whether a user is allowed to access an resource. * * @param string $resourceName Resource name. - * @param array $data Data. [Optional] + * @param array|null $data Data. [Optional] * @return bool */ - public function isAllowedAccess(string $resourceName, array $data = null): bool + public function isAllowedAccess(string $resourceName, ?array $data = null): bool { return $resourceName == 'error' || $this->policy->isAllowedAccess($resourceName, $data); } diff --git a/src/Access/Policy/Ip.php b/src/Access/Policy/Ip.php index 8d79b6f8f..2ca8c7ad7 100644 --- a/src/Access/Policy/Ip.php +++ b/src/Access/Policy/Ip.php @@ -42,10 +42,10 @@ public function __construct(string $ip) * {@inheritdoc} * * @param string $resourceName Resource name. - * @param array $data Data. [Optional] + * @param array|null $data Data. [Optional] * @return bool */ - public function isAllowedAccess(string $resourceName, array $data = null): bool + public function isAllowedAccess(string $resourceName, ?array $data = null): bool { $ip = $this->request->getClientAddress(); diff --git a/src/Access/PolicyInterface.php b/src/Access/PolicyInterface.php index c828366c3..155aa9ad4 100644 --- a/src/Access/PolicyInterface.php +++ b/src/Access/PolicyInterface.php @@ -18,8 +18,8 @@ interface PolicyInterface * Checks whether a user is allowed to access an resource. * * @param string $resourceName Resource name. - * @param array $data Data. [Optional] + * @param array|null $data Data. [Optional] * @return bool */ - public function isAllowedAccess(string $resourceName, array $data = null): bool; + public function isAllowedAccess(string $resourceName, ?array $data = null): bool; } diff --git a/src/Builder/Component/Scaffold.php b/src/Builder/Component/Scaffold.php index 856ced66f..57ebcc860 100644 --- a/src/Builder/Component/Scaffold.php +++ b/src/Builder/Component/Scaffold.php @@ -235,12 +235,16 @@ public function build(): bool * @param string $var * @param mixed $fields * @param bool $useGetSetters - * @param null|string $identityField + * @param string|null $identityField * * @return string */ - private function captureFilterInput(string $var, $fields, bool $useGetSetters, string $identityField = null): string - { + private function captureFilterInput( + string $var, + $fields, + bool $useGetSetters, + ?string $identityField = null + ): string { $code = ''; foreach ($fields as $field => $dataType) { if ($identityField !== null && $field === $identityField) { @@ -281,8 +285,8 @@ private function makeField(string $attribute, int $dataType, $relationField, arr $singularVar = '$' . Utils::lowerCamelizeWithDelimiter($this->options->get('singular'), '-', true); $id = 'field' . $helper->camelize($attribute); - $code = '
' . PHP_EOL . "\t" . '' . PHP_EOL . + $code = '
' . PHP_EOL . "\t" . '' . PHP_EOL . "\t" . '
' . PHP_EOL; if (isset($relationField[$attribute])) { @@ -339,8 +343,8 @@ private function makeFieldVolt(string $attribute, int $dataType, $relationField, $singular = $this->options->get('singular'); $id = 'field' . $helper->camelize($attribute); - $code = '
' . PHP_EOL . "\t" . '' . PHP_EOL . "\t" . + $code = '
' . PHP_EOL . "\t" . '' . PHP_EOL . "\t" . '
' . PHP_EOL; if (isset($relationField[$attribute])) { diff --git a/src/Builder/Path.php b/src/Builder/Path.php index 38e18df7f..089a210d8 100644 --- a/src/Builder/Path.php +++ b/src/Builder/Path.php @@ -23,9 +23,9 @@ class Path /** * @var string|null */ - protected $rootPath = null; + protected ?string $rootPath = null; - public function __construct(string $rootPath = null) + public function __construct(?string $rootPath = null) { $this->rootPath = $rootPath ?: realpath('.') . DIRECTORY_SEPARATOR; } @@ -76,7 +76,7 @@ public function getConfig($type = null): Config } /** - * @param null|string $path + * @param string|null $path */ public function setRootPath(?string $path = null) { @@ -86,7 +86,7 @@ public function setRootPath(?string $path = null) } /** - * @param null|string $path + * @param string|null $path */ public function getRootPath(?string $path = null): string { diff --git a/src/Generator/Snippet.php b/src/Generator/Snippet.php index 2acf05f0f..707be6b87 100644 --- a/src/Generator/Snippet.php +++ b/src/Generator/Snippet.php @@ -24,6 +24,7 @@ public function getSetter($originalFieldName, $fieldName, $type, $setterName) * Method to set the value of field %s * * @param %s \$%s + * * @return \$this */ public function set%s(\$%s) @@ -232,6 +233,8 @@ public function getInitialize(array $pieces) $templateInitialize = <<getMessage() . PHP_EOL; echo $e->getTraceAsString() . PHP_EOL; diff --git a/templates/project/cli/services.php b/templates/project/cli/services.php index 641641032..9bf40f1c6 100644 --- a/templates/project/cli/services.php +++ b/templates/project/cli/services.php @@ -30,4 +30,3 @@ return new $class($params); }); - diff --git a/templates/project/micro/app.php b/templates/project/micro/app.php index 4ace8a116..1b674bb2f 100644 --- a/templates/project/micro/app.php +++ b/templates/project/micro/app.php @@ -15,7 +15,7 @@ /** * Not found handler */ -$app->notFound(function () use($app) { +$app->notFound(function () use ($app) { $app->response->setStatusCode(404, "Not Found")->sendHeaders(); echo $app['view']->render('404'); }); diff --git a/templates/project/micro/views/404.phtml b/templates/project/micro/views/404.phtml index 00dfaf60e..a4e35b02e 100644 --- a/templates/project/micro/views/404.phtml +++ b/templates/project/micro/views/404.phtml @@ -1,7 +1,7 @@ - + Phalcon PHP Framework diff --git a/templates/project/micro/views/404.volt b/templates/project/micro/views/404.volt index 0978d3c0f..8e8395cc4 100644 --- a/templates/project/micro/views/404.volt +++ b/templates/project/micro/views/404.volt @@ -1,7 +1,7 @@ - + Phalcon PHP Framework diff --git a/templates/project/micro/views/index.phtml b/templates/project/micro/views/index.phtml index b966a7813..9faaf37a0 100644 --- a/templates/project/micro/views/index.phtml +++ b/templates/project/micro/views/index.phtml @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -20,7 +20,6 @@
- - + diff --git a/templates/project/micro/views/index.volt b/templates/project/micro/views/index.volt index 8952c760f..cd4a75dad 100644 --- a/templates/project/micro/views/index.volt +++ b/templates/project/micro/views/index.volt @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -20,7 +20,6 @@
- - + diff --git a/templates/project/modules/Module_cli.php b/templates/project/modules/Module_cli.php index cb36e07e1..c1aa662b9 100644 --- a/templates/project/modules/Module_cli.php +++ b/templates/project/modules/Module_cli.php @@ -12,9 +12,9 @@ class Module implements ModuleDefinitionInterface /** * Registers an autoloader related to the module * - * @param DiInterface $di + * @param DiInterface|null $di */ - public function registerAutoloaders(DiInterface $di = null) + public function registerAutoloaders(?DiInterface $di = null) { $loader = new Loader(); diff --git a/templates/project/modules/Module_web.php b/templates/project/modules/Module_web.php index 6cd29f1e3..016a4854e 100644 --- a/templates/project/modules/Module_web.php +++ b/templates/project/modules/Module_web.php @@ -14,9 +14,9 @@ class Module implements ModuleDefinitionInterface /** * Registers an autoloader related to the module * - * @param DiInterface $di + * @param DiInterface|null $di */ - public function registerAutoloaders(DiInterface $di = null) + public function registerAutoloaders(?DiInterface $di = null) { $loader = new Loader(); diff --git a/templates/project/modules/services.php b/templates/project/modules/services.php index 9b9ad001f..705b7f471 100644 --- a/templates/project/modules/services.php +++ b/templates/project/modules/services.php @@ -49,7 +49,7 @@ $volt = new VoltEngine($view, $this); $volt->setOptions([ - 'path' => function($templatePath) use ($config) { + 'path' => function ($templatePath) use ($config) { $basePath = $config->application->appDir; if ($basePath && substr($basePath, 0, 2) == '..') { $basePath = dirname(__DIR__); @@ -72,7 +72,7 @@ } if (!is_dir($cacheDir . DIRECTORY_SEPARATOR . 'volt')) { - @mkdir($cacheDir . DIRECTORY_SEPARATOR . 'volt' , 0755, true); + @mkdir($cacheDir . DIRECTORY_SEPARATOR . 'volt', 0755, true); } return $cacheDir . DIRECTORY_SEPARATOR . 'volt' . DIRECTORY_SEPARATOR . $filename; diff --git a/templates/project/modules/services_cli.php b/templates/project/modules/services_cli.php index f5fdf5b72..3e1d423a7 100644 --- a/templates/project/modules/services_cli.php +++ b/templates/project/modules/services_cli.php @@ -6,7 +6,7 @@ /** * Set the default namespace for dispatcher */ -$di->setShared('dispatcher', function() { +$di->setShared('dispatcher', function () { $dispatcher = new Dispatcher(); $dispatcher->setDefaultNamespace('@@namespace@@\Modules\Cli\Tasks'); return $dispatcher; diff --git a/templates/project/modules/services_web.php b/templates/project/modules/services_web.php index e8e1b043b..93eed8b58 100644 --- a/templates/project/modules/services_web.php +++ b/templates/project/modules/services_web.php @@ -58,12 +58,14 @@ 'notice' => 'alert alert-info', 'warning' => 'alert alert-warning' ]); + + return $flash; }); /** * Set the default namespace for dispatcher */ -$di->setShared('dispatcher', function() { +$di->setShared('dispatcher', function () { $dispatcher = new Dispatcher(); $dispatcher->setDefaultNamespace('@@namespace@@\Modules\Frontend\Controllers'); diff --git a/templates/project/modules/views/index.phtml b/templates/project/modules/views/index.phtml index c4a3ab45b..996dd5b62 100644 --- a/templates/project/modules/views/index.phtml +++ b/templates/project/modules/views/index.phtml @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -14,7 +14,6 @@ getContent(); ?>
- - + diff --git a/templates/project/modules/views/index.volt b/templates/project/modules/views/index.volt index f4ea036b0..425f33863 100644 --- a/templates/project/modules/views/index.volt +++ b/templates/project/modules/views/index.volt @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -14,7 +14,6 @@ {{ content() }}
- - + diff --git a/templates/project/simple/views/index.phtml b/templates/project/simple/views/index.phtml index c4a3ab45b..996dd5b62 100644 --- a/templates/project/simple/views/index.phtml +++ b/templates/project/simple/views/index.phtml @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -14,7 +14,6 @@ getContent(); ?>
- - + diff --git a/templates/project/simple/views/index.volt b/templates/project/simple/views/index.volt index f4ea036b0..425f33863 100644 --- a/templates/project/simple/views/index.volt +++ b/templates/project/simple/views/index.volt @@ -6,7 +6,7 @@ Phalcon Framework - + @@ -14,7 +14,6 @@ {{ content() }}
- - + diff --git a/templates/scaffold/no-forms/Controller.php b/templates/scaffold/no-forms/Controller.php index da04576be..93d289818 100644 --- a/templates/scaffold/no-forms/Controller.php +++ b/templates/scaffold/no-forms/Controller.php @@ -157,7 +157,6 @@ public function saveAction() $assignInputFromRequestUpdate$ if (!$singularVar$->save()) { - foreach ($singularVar$->getMessages() as $message) { $this->flash->error($message); } @@ -199,7 +198,6 @@ public function deleteAction($pkVar$) } if (!$singularVar$->delete()) { - foreach ($singularVar$->getMessages() as $message) { $this->flash->error($message); } diff --git a/templates/scaffold/no-forms/views/edit.phtml b/templates/scaffold/no-forms/views/edit.phtml index 30059cd38..4945dfaf7 100644 --- a/templates/scaffold/no-forms/views/edit.phtml +++ b/templates/scaffold/no-forms/views/edit.phtml @@ -18,11 +18,11 @@ getContent(); ?> -
+ $captureFields$ tag->inputHidden("id", $singularVar$->$pkGet$) ?> -
+
tag->inputSubmit("save", "Save", ['class' => "btn btn-primary"]) ?>
diff --git a/templates/scaffold/no-forms/views/edit.volt b/templates/scaffold/no-forms/views/edit.volt index a41c856f9..0b98da5eb 100644 --- a/templates/scaffold/no-forms/views/edit.volt +++ b/templates/scaffold/no-forms/views/edit.volt @@ -12,11 +12,11 @@ {{ content() }} - + $captureFields$ {{ inputHidden("id", $singular$.$pk$) }} -
+
{{ inputSubmit('save', 'Save', ['class': 'btn btn-primary']) }}
diff --git a/templates/scaffold/no-forms/views/index.phtml b/templates/scaffold/no-forms/views/index.phtml index d4e6d684c..dfd2ef8ef 100644 --- a/templates/scaffold/no-forms/views/index.phtml +++ b/templates/scaffold/no-forms/views/index.phtml @@ -13,9 +13,9 @@ flash->output() ?> - + $captureFields$ -
+
tag->inputSubmit("search", "Search", ["class" => "btn btn-primary"]) ?>
diff --git a/templates/scaffold/no-forms/views/index.volt b/templates/scaffold/no-forms/views/index.volt index 4b1561e65..2e50797ac 100644 --- a/templates/scaffold/no-forms/views/index.volt +++ b/templates/scaffold/no-forms/views/index.volt @@ -7,9 +7,9 @@ {{ flash.output() }} - + $captureFields$ -
+
{{ inputSubmit('search', 'Search', ['class': 'btn btn-primary']) }}
diff --git a/templates/scaffold/no-forms/views/new.phtml b/templates/scaffold/no-forms/views/new.phtml index 0af3675e1..95750cea5 100644 --- a/templates/scaffold/no-forms/views/new.phtml +++ b/templates/scaffold/no-forms/views/new.phtml @@ -18,9 +18,9 @@ getContent(); ?> - + $captureFields$ -
+
tag->inputSubmit("save", "Save", ['class' => "btn btn-primary"]) ?>
diff --git a/templates/scaffold/no-forms/views/new.volt b/templates/scaffold/no-forms/views/new.volt index 40292f4c5..6e3cfb06c 100644 --- a/templates/scaffold/no-forms/views/new.volt +++ b/templates/scaffold/no-forms/views/new.volt @@ -12,9 +12,9 @@ {{ content() }} - + $captureFields$ -
+
{{ inputSubmit('save', 'Save', ['class': 'btn btn-primary']) }}
diff --git a/tests/_data/console/app/models/files/TestModel.php b/tests/_data/console/app/models/files/TestModel.php index f304a9b41..6499e1606 100644 --- a/tests/_data/console/app/models/files/TestModel.php +++ b/tests/_data/console/app/models/files/TestModel.php @@ -35,6 +35,8 @@ class TestModel extends \Phalcon\Mvc\Model /** * Initialize method for model. + * + * @return void */ public function initialize() { @@ -46,6 +48,7 @@ public function initialize() * Allows to query a set of records that match the specified conditions * * @param mixed $parameters + * * @return TestModel[]|TestModel|\Phalcon\Mvc\Model\ResultSetInterface */ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface @@ -57,6 +60,7 @@ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInt * Allows to query the first record that match the specified conditions * * @param mixed $parameters + * * @return TestModel|\Phalcon\Mvc\Model\ResultInterface|\Phalcon\Mvc\ModelInterface|null */ public static function findFirst($parameters = null): ?\Phalcon\Mvc\ModelInterface diff --git a/tests/_data/console/app/models/files/TestModel2.php b/tests/_data/console/app/models/files/TestModel2.php index 0dd97ff8c..4a01fc4f2 100644 --- a/tests/_data/console/app/models/files/TestModel2.php +++ b/tests/_data/console/app/models/files/TestModel2.php @@ -21,6 +21,8 @@ class TestModel2 extends \Phalcon\Mvc\Model /** * Initialize method for model. + * + * @return void */ public function initialize() { @@ -32,6 +34,7 @@ public function initialize() * Allows to query a set of records that match the specified conditions * * @param mixed $parameters + * * @return TestModel2[]|TestModel2|\Phalcon\Mvc\Model\ResultSetInterface */ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface @@ -43,6 +46,7 @@ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInt * Allows to query the first record that match the specified conditions * * @param mixed $parameters + * * @return TestModel2|\Phalcon\Mvc\Model\ResultInterface|\Phalcon\Mvc\ModelInterface|null */ public static function findFirst($parameters = null): ?\Phalcon\Mvc\ModelInterface diff --git a/tests/_data/console/app/models/files/TestModel3.php b/tests/_data/console/app/models/files/TestModel3.php index 6d92c31d1..f718b7121 100644 --- a/tests/_data/console/app/models/files/TestModel3.php +++ b/tests/_data/console/app/models/files/TestModel3.php @@ -21,6 +21,8 @@ class TestModel3 extends \Phalcon\Mvc\Model /** * Initialize method for model. + * + * @return void */ public function initialize() { @@ -32,6 +34,7 @@ public function initialize() * Allows to query a set of records that match the specified conditions * * @param mixed $parameters + * * @return TestModel3[]|TestModel3|\Phalcon\Mvc\Model\ResultSetInterface */ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface @@ -43,6 +46,7 @@ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInt * Allows to query the first record that match the specified conditions * * @param mixed $parameters + * * @return TestModel3|\Phalcon\Mvc\Model\ResultInterface|\Phalcon\Mvc\ModelInterface|null */ public static function findFirst($parameters = null): ?\Phalcon\Mvc\ModelInterface diff --git a/tests/_data/console/app/models/files/TestModel5.php b/tests/_data/console/app/models/files/TestModel5.php index c279eaec0..4792f2520 100644 --- a/tests/_data/console/app/models/files/TestModel5.php +++ b/tests/_data/console/app/models/files/TestModel5.php @@ -21,6 +21,8 @@ class TestModel5 extends \Phalcon\Mvc\Model /** * Initialize method for model. + * + * @return void */ public function initialize() { @@ -31,6 +33,7 @@ public function initialize() * Allows to query a set of records that match the specified conditions * * @param mixed $parameters + * * @return TestModel5[]|TestModel5|\Phalcon\Mvc\Model\ResultSetInterface */ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface @@ -42,6 +45,7 @@ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInt * Allows to query the first record that match the specified conditions * * @param mixed $parameters + * * @return TestModel5|\Phalcon\Mvc\Model\ResultInterface|\Phalcon\Mvc\ModelInterface|null */ public static function findFirst($parameters = null): ?\Phalcon\Mvc\ModelInterface diff --git a/tests/_data/console/app/models/files/Testmodel4.php b/tests/_data/console/app/models/files/Testmodel4.php index 358b7834f..dd763cd5e 100644 --- a/tests/_data/console/app/models/files/Testmodel4.php +++ b/tests/_data/console/app/models/files/Testmodel4.php @@ -21,6 +21,8 @@ class Testmodel4 extends \Phalcon\Mvc\Model /** * Initialize method for model. + * + * @return void */ public function initialize() { @@ -32,6 +34,7 @@ public function initialize() * Allows to query a set of records that match the specified conditions * * @param mixed $parameters + * * @return Testmodel4[]|Testmodel4|\Phalcon\Mvc\Model\ResultSetInterface */ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface @@ -43,6 +46,7 @@ public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInt * Allows to query the first record that match the specified conditions * * @param mixed $parameters + * * @return Testmodel4|\Phalcon\Mvc\Model\ResultInterface|\Phalcon\Mvc\ModelInterface|null */ public static function findFirst($parameters = null): ?\Phalcon\Mvc\ModelInterface