Merge pull request #118 from phpcr/fix-php-7-support

dbu · web-flow · commit a37021eda555 · 2024-07-03T17:01:41.000+02:00
fix break for PHP 7.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,16 @@
 Changelog
 =========
 
+2.1.12
+------
+
+* **2024-07-03**: Revert BC breaks with nullable parameters as those are not supported in PHP 7.0.
+
 2.1.11
 ------
 
 * **2024-04-09**: Fixed `PHPCR\Query\QOM\QueryObjectModelFactoryInterface::literal` phpdoc return type.
+* **2024-04-08**: Code style fixes for PHP 8.3.
 
 2.1.10
 ------
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
`@@ -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.`