From 33e2b7529fbd7190f024dd3d66a6e9a2b95e6f5b Mon Sep 17 00:00:00 2001 From: Brandon Nifong Date: Tue, 5 Jul 2022 07:41:28 -0500 Subject: [PATCH] chore(deps): Bump dependencies chore: add back `->sortByName()` when registering paths --- composer.lock | 52 +++++++++++++++++++++------------------------ src/AcfComposer.php | 2 +- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 80fa24ab..07e19b30 100644 --- a/composer.lock +++ b/composer.lock @@ -8,34 +8,30 @@ "packages": [ { "name": "doctrine/inflector", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", - "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^7.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "doctrine/coding-standard": "^8.2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^4.10" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" @@ -83,7 +79,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.x" + "source": "https://github.com/doctrine/inflector/tree/2.0.4" }, "funding": [ { @@ -99,20 +95,20 @@ "type": "tidelift" } ], - "time": "2020-05-29T15:13:26+00:00" + "time": "2021-10-22T20:16:43+00:00" }, { "name": "stoutlogic/acf-builder", - "version": "1.11.1", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/StoutLogic/acf-builder.git", - "reference": "85f506fa469b473ae7807be517e559b901356c18" + "reference": "e63ab87233ea3675cd519f1dd6b6d4230b3cef97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/StoutLogic/acf-builder/zipball/85f506fa469b473ae7807be517e559b901356c18", - "reference": "85f506fa469b473ae7807be517e559b901356c18", + "url": "https://api.github.com/repos/StoutLogic/acf-builder/zipball/e63ab87233ea3675cd519f1dd6b6d4230b3cef97", + "reference": "e63ab87233ea3675cd519f1dd6b6d4230b3cef97", "shasum": "" }, "require": { @@ -143,24 +139,24 @@ "description": "An Advanced Custom Field Configuration Builder", "support": { "issues": "https://github.com/StoutLogic/acf-builder/issues", - "source": "https://github.com/StoutLogic/acf-builder/tree/1.11.1" + "source": "https://github.com/StoutLogic/acf-builder/tree/v1.12.0" }, - "time": "2021-07-13T18:51:50+00:00" + "time": "2021-09-17T17:32:44+00:00" } ], "packages-dev": [ { "name": "squizlabs/php_codesniffer", - "version": "3.6.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", "shasum": "" }, "require": { @@ -203,7 +199,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-04-09T00:54:41+00:00" + "time": "2022-06-18T07:21:10+00:00" } ], "aliases": [], @@ -215,5 +211,5 @@ "php": "^7.3|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/src/AcfComposer.php b/src/AcfComposer.php index 74a91d5e..94113989 100644 --- a/src/AcfComposer.php +++ b/src/AcfComposer.php @@ -87,7 +87,7 @@ public function registerPath($path, $namespace = null) $namespace = $this->app->getNamespace(); } - foreach ((new Finder())->in($paths->toArray())->files() as $file) { + foreach ((new Finder())->in($paths->toArray())->files()->sortByName() as $file) { $relativePath = Str::remove( $this->app->path() . DIRECTORY_SEPARATOR, $file->getPathname()