From 186c29bd5b30de9d880e7c0ebb25e607177bce97 Mon Sep 17 00:00:00 2001 From: babaev-an Date: Tue, 4 Feb 2025 16:27:55 +0300 Subject: [PATCH] 20250204-1 --- .idea/anb_php_components_pack.iml | 9 +-------- .idea/phpunit.xml | 10 ---------- composer.json | 3 ++- composer.lock | 6 +++--- .../ObjectArray/ObjectArraySearchAndSortTrait.php | 8 ++++---- vendor/composer/installed.php | 4 ++-- vendor/phpunit/phpunit/.phpunit.result.cache | 1 - 7 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 .idea/phpunit.xml delete mode 100644 vendor/phpunit/phpunit/.phpunit.result.cache diff --git a/.idea/anb_php_components_pack.iml b/.idea/anb_php_components_pack.iml index 0ee0ec1..6efcb4a 100644 --- a/.idea/anb_php_components_pack.iml +++ b/.idea/anb_php_components_pack.iml @@ -3,14 +3,7 @@ - - - - - - - - + diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml deleted file mode 100644 index 4f8104c..0000000 --- a/.idea/phpunit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/composer.json b/composer.json index 26fed5c..0bdad97 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,8 @@ { "name": "goodboyalex/php_components_pack", "description": "[RU] Набор компонентов для сайта на PHP / [EN] A set of components for PHP website", - "minimum-stability": "stable", + "minimum-stability": "dev", + "prefer-stable": true, "keywords": [ "components" ], diff --git a/composer.lock b/composer.lock index 7f6e378..37dbd50 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": "3e8e67b45a0b9103475706ce9f6a3ba1", + "content-hash": "8bc9437d9c5d186ea8bb5c53103f902f", "packages": [], "packages-dev": [ { @@ -1697,9 +1697,9 @@ } ], "aliases": [], - "minimum-stability": "stable", + "minimum-stability": "dev", "stability-flags": {}, - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=8.4", diff --git a/sources/traits/ObjectArray/ObjectArraySearchAndSortTrait.php b/sources/traits/ObjectArray/ObjectArraySearchAndSortTrait.php index ac87ab6..6490189 100644 --- a/sources/traits/ObjectArray/ObjectArraySearchAndSortTrait.php +++ b/sources/traits/ObjectArray/ObjectArraySearchAndSortTrait.php @@ -42,9 +42,9 @@ trait ObjectArraySearchAndSortTrait * * @param bool $descending Направление сортировки * - * @return array Отсортированный массив объектов + * @return void */ - public function SortCallback (callable $objectPropertyValuePredicate, bool $descending = false): array + public function SortCallback (callable $objectPropertyValuePredicate, bool $descending = false): void { // Создаём результирующий массив $result = array_merge($this->Container, []); @@ -56,8 +56,8 @@ trait ObjectArraySearchAndSortTrait ? $objectPropertyValuePredicate($a) <=> $objectPropertyValuePredicate($b) : $objectPropertyValuePredicate($b) <=> $objectPropertyValuePredicate($a)); - // Возвращаем результат - return $result; + // Присваиваем результат + $this->Container = $result; } /** diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 0d24b0c..d4d2266 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'goodboyalex/php_components_pack', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '50343d5a87c64d1ac1cf93a8c89a7f294b3dfe44', + 'reference' => '6ed1df2eda6978ae8b1fac707d7c0b762bfe491d', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ 'goodboyalex/php_components_pack' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '50343d5a87c64d1ac1cf93a8c89a7f294b3dfe44', + 'reference' => '6ed1df2eda6978ae8b1fac707d7c0b762bfe491d', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/phpunit/phpunit/.phpunit.result.cache b/vendor/phpunit/phpunit/.phpunit.result.cache deleted file mode 100644 index 972a1b3..0000000 --- a/vendor/phpunit/phpunit/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"defects":[],"times":{"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testSort":0.01,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testSearch":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testGetRows":0.001,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testGetValue":0.002,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testCount":0.001,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testDelete":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testClear":0.001,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testMerge":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testMaxBy":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testGetColumn":0.002,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testToArray":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testMinBy":0,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testIsExist":0.001,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testUpdate":0.001,"goodboyalex\\php_components_pack\\tests\\classes\\ObjectArrayTest::testGetRow":0.002}} \ No newline at end of file