Fixing version availability according to composer error message for pointybeard helpers-cli-input

Restoring exact versions of pointybeard/ packages
Downgrading version of pointybeard/helpers-cli-input
2023-07-27 14:57:58 +02:00 · 2023-07-27 14:55:09 +02:00 · 2023-07-27 14:50:26 +02:00 · 2023-07-27 14:45:55 +02:00
9 changed files with 148 additions and 202 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@ vendor/
 \#*#
 .*.marks

+/nbproject/private/
--- a/bin/cfg
+++ b/bin/cfg
@ -22,7 +22,7 @@ foreach ($autoloadFiles as $autoloadFile) {
 	}
 }

-$version = '0.3';
+$version = '0.2';

 $actions = [ 'show', 'write', 'help' ];
 $settings = ['key' => '', 'value' => ''];
@ -158,7 +158,7 @@ try {
 			exit(0);
 		}
 	}
-	fwrite(STDERR, $ex->getMessage().PHP_EOL);
+	echo $ex->getMessage().PHP_EOL;
 	exit(1);
 }

@ -204,7 +204,7 @@ try {
 		$cfg->load(require($cfgFile));
 	}
 } catch (Exception $e) {
-	fwrite(STDERR, "Error: ".$e->getMessage().PHP_EOL);
+	echo "Error: ".$e->getMessage()."\n";
 	exit(1);
 }
 //var_dump($cfg);
@ -220,7 +220,7 @@ if ($settings['key'])
 			$result = $result->{$setting};
 		}
 		catch (\OutOfRangeException $e) {
-			fwrite(STDERR, $e->getMessage().PHP_EOL);
+			echo $e->getMessage().PHP_EOL;
 			exit(1);
 		}
 	}
--- a/composer.json
+++ b/composer.json
@ -1,7 +1,6 @@
 {
 	"name": "rabe/util-settings",
 	"description": "Package for reading and writing configuration settings",
-	"bin": ["bin/cfg"],
 	"license": "AGPL3",
 	"authors": [
 		{
@ -15,8 +14,8 @@
 		}
 	},
 	"require": {
-		"pointybeard/helpers-cli-input": "dev-master as 1.2.3",
-		"pointybeard/helpers-functions-cli": "dev-master as 1.2"
+		"pointybeard/helpers-cli-input": "1.2.2.2",
+		"pointybeard/helpers-functions-cli": "v1.1.10"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5"
--- a/composer.lock
+++ b/composer.lock
@ -498,30 +498,30 @@
    "packages-dev": [
        {
            "name": "doctrine/instantiator",
-            "version": "2.0.0",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                "shasum": ""
            },
            "require": {
-                "php": "^8.1"
+                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^11",
+                "doctrine/coding-standard": "^9 || ^11",
                "ext-pdo": "*",
                "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.30 || ^5.4"
            },
            "type": "library",
            "autoload": {
@ -548,7 +548,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
            },
            "funding": [
                {
@ -564,20 +564,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-12-30T00:23:10+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
        },
        {
            "name": "myclabs/deep-copy",
-            "version": "1.12.1",
+            "version": "1.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                "shasum": ""
            },
            "require": {
@ -585,12 +585,11 @@
            },
            "conflict": {
                "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
            },
            "require-dev": {
                "doctrine/collections": "^1.6.8",
                "doctrine/common": "^2.13.3 || ^3.2.2",
-                "phpspec/prophecy": "^1.10",
                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
            },
            "type": "library",
@ -616,7 +615,7 @@
            ],
            "support": {
                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
            },
            "funding": [
                {
@ -624,31 +623,29 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-08T17:47:46+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.4.0",
+            "version": "v4.15.4",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
                "shasum": ""
            },
            "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
                "ext-tokenizer": "*",
-                "php": ">=7.4"
+                "php": ">=7.0"
            },
            "require-dev": {
                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
            },
            "bin": [
                "bin/php-parse"
@ -656,7 +653,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "4.9-dev"
                }
            },
            "autoload": {
@ -680,27 +677,26 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
            },
-            "time": "2024-12-30T11:07:19+00:00"
+            "time": "2023-03-05T19:49:14+00:00"
        },
        {
            "name": "phar-io/manifest",
-            "version": "2.0.4",
+            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
-                "ext-libxml": "*",
                "ext-phar": "*",
                "ext-xmlwriter": "*",
                "phar-io/version": "^3.0.1",
@ -741,15 +737,9 @@
            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
            "support": {
                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
            },
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-03T12:33:53+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
        },
        {
            "name": "phar-io/version",
@ -804,35 +794,35 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.32",
+            "version": "9.2.26",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
+                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
-                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "nikic/php-parser": "^4.15",
                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.6",
-                "phpunit/php-text-template": "^2.0.4",
-                "sebastian/code-unit-reverse-lookup": "^2.0.3",
-                "sebastian/complexity": "^2.0.3",
-                "sebastian/environment": "^5.1.5",
-                "sebastian/lines-of-code": "^1.0.4",
-                "sebastian/version": "^3.0.2",
-                "theseer/tokenizer": "^1.2.3"
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^9.6"
+                "phpunit/phpunit": "^9.3"
            },
            "suggest": {
                "ext-pcov": "PHP extension that provides line coverage",
@ -841,7 +831,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "9.2.x-dev"
+                    "dev-master": "9.2-dev"
                }
            },
            "autoload": {
@ -869,8 +859,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
            },
            "funding": [
                {
@ -878,7 +867,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-08-22T04:23:01+00:00"
+            "time": "2023-03-06T12:58:08+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@ -1123,45 +1112,45 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.6.22",
+            "version": "9.6.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c"
+                "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c",
-                "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86e761949019ae83f49240b2f2123fb5ab3b2fc5",
+                "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5",
                "shasum": ""
            },
            "require": {
-                "doctrine/instantiator": "^1.5.0 || ^2",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                "ext-dom": "*",
                "ext-json": "*",
                "ext-libxml": "*",
                "ext-mbstring": "*",
                "ext-xml": "*",
                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.1",
-                "phar-io/manifest": "^2.0.4",
-                "phar-io/version": "^3.2.1",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.32",
-                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.4",
-                "phpunit/php-timer": "^5.0.3",
-                "sebastian/cli-parser": "^1.0.2",
-                "sebastian/code-unit": "^1.0.8",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.6",
-                "sebastian/environment": "^5.1.5",
-                "sebastian/exporter": "^4.0.6",
-                "sebastian/global-state": "^5.0.7",
-                "sebastian/object-enumerator": "^4.0.4",
-                "sebastian/resource-operations": "^3.0.4",
-                "sebastian/type": "^3.2.1",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.5",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.2",
                "sebastian/version": "^3.0.2"
            },
            "suggest": {
@ -1205,8 +1194,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.5"
            },
            "funding": [
                {
@ -1222,20 +1210,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-12-05T13:48:26+00:00"
+            "time": "2023-03-09T06:34:10+00:00"
        },
        {
            "name": "sebastian/cli-parser",
-            "version": "1.0.2",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
                "shasum": ""
            },
            "require": {
@ -1270,7 +1258,7 @@
            "homepage": "https://github.com/sebastianbergmann/cli-parser",
            "support": {
                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
            },
            "funding": [
                {
@ -1278,7 +1266,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T06:27:43+00:00"
+            "time": "2020-09-28T06:08:49+00:00"
        },
        {
            "name": "sebastian/code-unit",
@ -1467,20 +1455,20 @@
        },
        {
            "name": "sebastian/complexity",
-            "version": "2.0.3",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.7",
                "php": ">=7.3"
            },
            "require-dev": {
@ -1512,7 +1500,7 @@
            "homepage": "https://github.com/sebastianbergmann/complexity",
            "support": {
                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
            },
            "funding": [
                {
@ -1520,20 +1508,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-12-22T06:19:30+00:00"
+            "time": "2020-10-26T15:52:27+00:00"
        },
        {
            "name": "sebastian/diff",
-            "version": "4.0.6",
+            "version": "4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                "shasum": ""
            },
            "require": {
@ -1578,7 +1566,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
            },
            "funding": [
                {
@ -1586,7 +1574,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T06:30:58+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
        },
        {
            "name": "sebastian/environment",
@ -1653,16 +1641,16 @@
        },
        {
            "name": "sebastian/exporter",
-            "version": "4.0.6",
+            "version": "4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                "shasum": ""
            },
            "require": {
@ -1718,7 +1706,7 @@
            ],
            "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.5"
            },
            "funding": [
                {
@ -1726,20 +1714,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T06:33:00+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
        },
        {
            "name": "sebastian/global-state",
-            "version": "5.0.7",
+            "version": "5.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
            },
            "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/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                "shasum": ""
            },
            "require": {
@ -1782,7 +1770,7 @@
            ],
            "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.5"
            },
            "funding": [
                {
@ -1790,24 +1778,24 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T06:35:11+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
        },
        {
            "name": "sebastian/lines-of-code",
-            "version": "1.0.4",
+            "version": "1.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.6",
                "php": ">=7.3"
            },
            "require-dev": {
@ -1839,7 +1827,7 @@
            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
            "support": {
                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
            },
            "funding": [
                {
@ -1847,7 +1835,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-12-22T06:20:34+00:00"
+            "time": "2020-11-28T06:42:11+00:00"
        },
        {
            "name": "sebastian/object-enumerator",
@ -2026,16 +2014,16 @@
        },
        {
            "name": "sebastian/resource-operations",
-            "version": "3.0.4",
+            "version": "3.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                "shasum": ""
            },
            "require": {
@ -2047,7 +2035,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-master": "3.0-dev"
                }
            },
            "autoload": {
@ -2068,7 +2056,8 @@
            "description": "Provides a list of PHP built-in functions that operate on resources",
            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
            "support": {
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
            },
            "funding": [
                {
@ -2076,7 +2065,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-14T16:00:52+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
        },
        {
            "name": "sebastian/type",
@ -2189,16 +2178,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                "shasum": ""
            },
            "require": {
@ -2227,7 +2216,7 @@
            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
            "support": {
                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
            },
            "funding": [
                {
@ -2235,7 +2224,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
        }
    ],
    "aliases": [
--- a/src/Settings.php
+++ b/src/Settings.php
@ -26,7 +26,7 @@ namespace rabe\Util;
 * Settings Class to read Configuration Files
 * @author Norbert.e.Wagner dev@norb.me
 */
-class Settings implements \Iterator, \Countable
+class Settings implements \Iterator
 {
 	private const SITE = 0x01;
 	
@ -153,7 +153,7 @@ class Settings implements \Iterator, \Countable
 	
 			// load local config without merging - we need it here for the mode
 			$conf = $this->buildFileName();
-			$localConf = [];
+			$localConf = false;
 			if (file_exists($conf)) $localConf = require($conf);
 	
 			// if a mode was set in the constructor do not overwrite it
@ -169,7 +169,7 @@ class Settings implements \Iterator, \Countable
 				$siteConf = $this->buildFileName(self::SITE);
 				if (file_exists($siteConf))
 				{
-					$localConf = array_replace_recursive($localConf, require($siteConf));
+					$localConf = array_replace_recursive($this->settings, require($siteConf));
 				}
 			}
 	
@ -177,7 +177,7 @@ class Settings implements \Iterator, \Countable
 			if ( isset( $this->modes[ $this->mode ] ) )
 			{
 				$modeConf = $this->buildFileName( $this->modes[ $this->mode ] );
-
+	
 				if ( file_exists($modeConf) )
 				{
 					$this->settings = array_replace_recursive( $this->settings, require($modeConf) );
@ -270,7 +270,7 @@ class Settings implements \Iterator, \Countable
 	 * Rewind the Iterator to the first element
 	 * @link https://www.php.net/iterator.rewind
 	 */
-	public function rewind(): void
+	public function rewind()
 	{
 		reset( $this->settings);
 	}
@ -279,7 +279,7 @@ class Settings implements \Iterator, \Countable
 	 * Return the current element
 	 * @link https://www.php.net/iterator.current
 	 */
-	public function current(): mixed
+	public function current()
 	{
 		return current( $this->settings );
 	}
@ -288,7 +288,7 @@ class Settings implements \Iterator, \Countable
 	 * Return the key of the current element
 	 * @link https://www.php.net/iterator.key
 	 */
-	public function key(): mixed
+	public function key()
 	{
 		return key( $this->settings );
 	}
@ -297,16 +297,16 @@ class Settings implements \Iterator, \Countable
 	 * Move forward to next element
 	 * @link https://www.php.net/iterator.next
 	 */
-	public function next(): void
+	public function next()
 	{
-		next( $this->settings );
+		return next( $this->settings );
 	}

 	/**
 	 * Checks if current position is valid
 	 * @link https://www.php.net/iterator.valid
 	 */
-	public function valid(): bool
+	public function valid()
 	{
 		$key = key( $this->settings );
 		return ($key !== null && $key !== false);
@ -314,17 +314,6 @@ class Settings implements \Iterator, \Countable

 	// }}}

-	// Countable {{{
-	/**
-	 * Count elements
-	 * @link https://www.php.net/countable.count.php
-	 */
-	public function count(): int
-	{
-		return count($this->settings);
-	}
-	// }}}
-	
 	// Magic getter/setter methods {{{
 	public function __set( $name, $value )
 	{
--- a/tests/SettingsTest.php
+++ b/tests/SettingsTest.php
@ -30,7 +30,7 @@ class SettingsTest extends TestCase
 	public function testConstruct()
 	{
 		$cfg = new Settings();
-		$this->assertIsObject($cfg);
+		$this->assertNotEmpty($cfg);
 	}

 	/**
@ -69,7 +69,7 @@ class SettingsTest extends TestCase
 	{
 		$cfg = new Settings();
 		$cfg = $this->appPath($cfg)->load();
-		$this->assertIsObject($cfg);
+		$this->assertNotEmpty($cfg);
 		return $cfg;
 	}
 	
@ -129,23 +129,7 @@ class SettingsTest extends TestCase
 		$this->assertEquals('site', $cfg->testFile);
 		$this->assertEquals(42, $cfg->answer);
 	}
-
-	/**
-	 */
-	public function testLoadingOrder()
-	{
-		$cfg = new Settings();
-		$cfg = $this->appPath($cfg, 'order')->site('site')->load();
-
-		$this->assertEquals('default', $cfg->testFiles);
-		$this->assertEquals('conf', $cfg->testFiles2);
-		$this->assertEquals('site', $cfg->testFile);
-		$this->assertEquals(42, $cfg->answer);
-
-		return $cfg;
-	}
-
-
+	
 	/**
 	 */
 	public function testTestingOverride()
@ -240,4 +224,4 @@ class SettingsTest extends TestCase

 /* jEdit buffer local properties {{{
 * :folding=explicit:collapseFolds=1:
-}}}*/
+}}}*/
--- a/tests/cfg/order/config/conf.php
+++ b/tests/cfg/order/config/conf.php
@ -1,5 +0,0 @@
-<?php return [
-	'answer' => 1,
-	'testFile' => 'conf',
-	'testFiles2' => 'conf'
-];
--- a/tests/cfg/order/config/default.conf.php
+++ b/tests/cfg/order/config/default.conf.php
@ -1,7 +0,0 @@
-<?php return [
-	'mode' => 'prod',
-	'answer' => 0,
-	'testFile' => 'default',
-	'testFiles' => 'default',
-	'testFiles2' => 'default'
-];
--- a/tests/cfg/order/config/site/conf.php
+++ b/tests/cfg/order/config/site/conf.php
@ -1,4 +0,0 @@
-<?php return [
-	'answer' => 42,
-	'testFile' => 'site'
-];
Author	SHA1	Message	Date
lu	3e254794a2	Fixing version availability according to composer error message for pointybeard helpers-cli-input	2023-07-27 14:57:58 +02:00
lu	60b39922ea	Restoring exact versions of pointybeard/ packages	2023-07-27 14:55:09 +02:00
lu	2deb793295	Downgrading version of pointybeard/helpers-cli-input	2023-07-27 14:50:26 +02:00
lu	7c6875c3d9	Switching pointybeard/helpers-cli-input and pointybeard/helpers-functions-cli to fix requirement definition error in composer	2023-07-27 14:45:55 +02:00