Merge branch '4.x-dev' into revert-and-add-baseline

Author: richard67

.drone.jsonnet

@@ -1,12 +1,10 @@
 .github/ export-ignore
-.phan/ export-ignore
 docs/ export-ignore
 tests/ export-ignore
-.drone.jsonnet export-ignore
-.drone.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 phpstan.neon export-ignore
+phpstan-baseline.neon export-ignore
 phpunit.xml.dist export-ignore
 ruleset.xml export-ignore

.drone.yml

@@ -194,18 +194,18 @@ Array
 
 ## Installation via Composer
 
-Add `"joomla/registry": "~3.0"` to the 'require' block in your composer.json and then run `composer install`.
+Add `"joomla/registry": "~4.0"` to the 'require' block in your composer.json and then run `composer install`.
 
 ```json
 {
     "require": {
-        "joomla/registry": "~3.0"
+        "joomla/registry": "~4.0"
     }
 }
 ```
 
 Alternatively, you can simply run the following from the command line:
 
 ```sh
-composer require joomla/registry "~3.0"
+composer require joomla/registry "~4.0"
 ```

.gitattributes

@@ -5,7 +5,8 @@
 These versions are currently being supported with security updates:
 
 | Version | Supported          |
-| ------- | ------------------ |
+|---------| ------------------ |
+| 4.x.x   | :white_check_mark: |
 | 3.x.x   | :white_check_mark: |
 | 2.0.x   | :white_check_mark: |
 | 1.6.x   | :x:                |

README.md

@@ -6,15 +6,15 @@
     "homepage": "https://github.com/joomla-framework/registry",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": "^8.1.0",
+        "php": "^8.3.0",
         "joomla/utilities": "dev-4.x-dev"
     },
     "require-dev": {
-        "symfony/yaml": "^5.0",
-        "phpunit/phpunit": "^9.5.28",
+        "symfony/yaml": "^7.3",
+        "phpunit/phpunit": "^12.2.6",
         "squizlabs/php_codesniffer": "^3.7.2",
-        "phpstan/phpstan": "1.12.27",
-        "phpstan/phpstan-deprecation-rules": "1.2.1"
+        "phpstan/phpstan": "^2.1.17",
+        "phpstan/phpstan-deprecation-rules": "^2.0.3"
     },
     "suggest": {
         "ext-json": "ext-json is needed for JSON support",
@@ -43,10 +43,6 @@
         "test": "vendor/bin/phpunit",
         "testdox": "vendor/bin/phpunit --testdox",
         "coverage": "vendor/bin/phpunit --coverage-html build/coverage",
-        "sign": [
-            "drone jsonnet --stream",
-            "drone sign joomla-framework/registry --save"
-        ],
         "style": "vendor/bin/phpcs -p --report=full --extensions=php --standard=PSR12 src/"
     }
 }

SECURITY.md

@@ -1,2 +1,4 @@
 * [Overview](overview.md)
 * [Updating from v1 to v2](v1-to-v2-update.md)
+* [Updating from v2 to v3](v2-to-v3-update.md)
+* [Updating from v3 to v4](v3-to-v4-update.md)

composer.json

@@ -0,0 +1,15 @@
+## Updating from Version 3 to Version 4
+
+The following changes were made to the Registry package between version 3 and version 4.
+
+### Minimum supported PHP version raised
+
+All Framework packages now require PHP 8.3 or newer.
+
+### Enforce strings as input for `stringToObject()`
+
+The input to `FormatInterface::stringToObject()` has always been string in the docblock, but starting now it is also enforced by a typehint in the method header. Make sure to really hand in strings.
+
+### Separator has been removed from `Registry::set()` and `Registry::loadArray()`
+
+`Registry::set()` allowed to hand in an on-the-fly separator, which could lead to conflicts with the set separator in the object. In version 4 this has been removed and since `Registry::loadArray()` also uses `Registry::set()` internally, its been removed from this method as well.

docs/index.md

@@ -1,6 +1,7 @@
 
 includes:
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- phpstan-baseline.neon
 
 parameters:
 	level: 5

docs/v3-to-v4-update.md

@@ -124,7 +124,7 @@ public function objectToString($object, array $options = [])
      *
      * @since   1.0.0
      */
-    public function stringToObject($data, array $options = [])
+    public function stringToObject(string $data, array $options = [])
     {
         $options = \array_merge(static::$options, $options);