Merge pull request #119 from phpcr/php83

dbu · web-flow · commit 2cb17acc6c4b · 2024-07-03T17:07:05.000+02:00
drop php 5 and 7.0 that don't support the ? syntax for optional param…
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -20,8 +20,6 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: '5.6'
-                    - php-version: '7.0'
                     - php-version: '7.1'
                     - php-version: '7.2'
                     - php-version: '7.3'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.1.13
+------
+
+* **2024-07-03**: Drop support for PHP 7.0 and 5.6 to allow `?` in parameters to avoid warning with PHP 8.3 and prepare for PHP 9.
+
 2.1.12
 ------
 
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0 || ^8.0"
+        "php": "^7.1 || ^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
diff --git a/src/PHPCR/Query/QOM/QueryObjectModelFactoryInterface.php b/src/PHPCR/Query/QOM/QueryObjectModelFactoryInterface.php
@@ -48,7 +48,7 @@ interface QueryObjectModelFactoryInterface extends QueryObjectModelConstantsInte
      */
     public function createQuery(
         SourceInterface $source,
-        ConstraintInterface $constraint = null,
+        ?ConstraintInterface $constraint = null,
         array $orderings = [],
         array $columns = []
     );
diff --git a/src/PHPCR/RepositoryFactoryInterface.php b/src/PHPCR/RepositoryFactoryInterface.php
@@ -55,7 +55,7 @@ interface RepositoryFactoryInterface
      *
      * @api
      */
-    public function getRepository(array $parameters = null);
+    public function getRepository(?array $parameters = null);
 
     /**
      * Get the list of configuration options that can be passed to
diff --git a/src/PHPCR/RepositoryInterface.php b/src/PHPCR/RepositoryInterface.php
@@ -567,7 +567,7 @@ interface RepositoryInterface
      *
      * @api
      */
-    public function login(CredentialsInterface $credentials = null, $workspaceName = null);
+    public function login(?CredentialsInterface $credentials = null, $workspaceName = null);
 
     /**
      * All descriptor keys available for this implementation.

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`}`
`24`	`24`	`],`
`25`	`25`	`"require": {`
`26`		`- "php": "^5.6 \|\| ^7.0 \|\| ^8.0"`
	`26`	`+ "php": "^7.1 \|\| ^8.0"`
`27`	`27`	`},`
`28`	`28`	`"require-dev": {`
`29`	`29`	`"phpunit/phpunit": "^5.7 \|\| ^6.0 \|\| ^7.0 \|\| ^8.0 \|\| ^9.0 \|\| ^10.0"`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ interface RepositoryFactoryInterface`
`55`	`55`	`*`
`56`	`56`	`* @api`
`57`	`57`	`*/`
`58`		`- public function getRepository(array $parameters = null);`
	`58`	`+ public function getRepository(?array $parameters = null);`
`59`	`59`
`60`	`60`	`/**`
`61`	`61`	`* Get the list of configuration options that can be passed to`
Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ interface RepositoryInterface`
`567`	`567`	`*`
`568`	`568`	`* @api`
`569`	`569`	`*/`
`570`		`- public function login(CredentialsInterface $credentials = null, $workspaceName = null);`
	`570`	`+ public function login(?CredentialsInterface $credentials = null, $workspaceName = null);`
`571`	`571`
`572`	`572`	`/**`
`573`	`573`	`* All descriptor keys available for this implementation.`