Align with changes in dependencies.

prwater · prwater · commit 970e5abe7dd4 · 2024-09-29T12:47:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 /.idea/
-/.phpunit.result.cache
+/.phpunit.cache/
 /bin/
 /composer.lock
-/custom.task.properties
-/custom.type.properties
 /test/Command/Foo.php
 /test/coverage.xml
 /test/report/
diff --git a/composer.json b/composer.json
@@ -11,24 +11,22 @@
     "ext-dom": "*",
     "ext-libxml": "*",
     "plaisio/console": "^3.0.0",
-    "plaisio/error-logger": "^1.2.0",
-    "plaisio/exception": "^1.1.0",
-    "plaisio/exception-handler": "^2.0.0",
-    "plaisio/kernel": "^3.1.1",
+    "plaisio/error-logger": "^1.3.0",
+    "plaisio/exception": "^1.2.0",
+    "plaisio/exception-handler": "^2.1.0",
+    "plaisio/kernel": "^3.2.1",
     "plaisio/obfuscator": "^2.0.0",
-    "plaisio/request": "^0.13.0",
-    "plaisio/request-logger": "^1.2.0",
+    "plaisio/request": "^1.0.0",
+    "plaisio/request-logger": "^1.3.0",
     "plaisio/response-core": "^2.8.0",
     "plaisio/session": "^5.0.0",
-    "setbased/helper-code-store-php": "^2.4.2",
-    "setbased/php-stratum-middle": "^5.7.0",
+    "setbased/helper-code-store-php": "^2.6.0",
+    "setbased/php-stratum-middle": "^5.11.0",
     "symfony/console": "^6.2.5"
   },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
   "require-dev": {
-    "phing/phing": "^3.0.0-RC4",
-    "phpunit/phpunit": "^9.6.3",
+    "phing/phing": "^3.0.0",
+    "phpunit/phpunit": "^10.5.35",
     "plaisio/console-kernel": "^1.0.1"
   },
   "autoload": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">vendor/setbased</directory>
-    </exclude>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <clover outputFile="test/coverage.xml"/>
       <html outputDirectory="test/report"/>
@@ -18,4 +12,12 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">vendor/setbased</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/BadRequestExceptionAgent.php b/src/BadRequestExceptionAgent.php
@@ -81,7 +81,7 @@ private function handleException(BadRequestException $exception): Response
     $this->nub->DL->commit();
 
     // Only on development environment log the error.
-    if ($this->nub->request->isEnvDev())
+    if ($this->nub->request->isEnvDev)
     {
       $this->nub->errorLogger->logError($exception);
     }
diff --git a/src/Command/GenerateExceptionHandlerCommand.php b/src/Command/GenerateExceptionHandlerCommand.php
@@ -21,7 +21,7 @@ class GenerateExceptionHandlerCommand extends PlaisioCommand
   /**
    * @inheritdoc
    */
-  protected function configure()
+  protected function configure(): void
   {
     $this->setName('plaisio:generate-core-exception-handler')
          ->setDescription('Generates the code for the core\'s exception handler');
diff --git a/src/DecodeExceptionAgent.php b/src/DecodeExceptionAgent.php
@@ -31,7 +31,7 @@ public function handleConstructException(DecodeException $exception): Response
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Handles a DecodeException thrown thrown during the preparation phase.
+   * Handles a DecodeException thrown during the preparation phase.
    *
    * @param DecodeException $exception The exception.
    *
@@ -81,7 +81,7 @@ private function handleException(DecodeException $exception): Response
     $this->nub->DL->commit();
 
     // Only on development environment log the error.
-    if ($this->nub->request->isEnvDev())
+    if ($this->nub->request->isEnvDev)
     {
       $this->nub->errorLogger->logError($exception);
     }
diff --git a/src/Helper/ExceptionHandlerCodeGenerator.php b/src/Helper/ExceptionHandlerCodeGenerator.php
@@ -176,7 +176,7 @@ private function generateTrailer(): void
    */
   private function importClasses(array $allAgents): void
   {
-    foreach ($allAgents as $name => $agents)
+    foreach ($allAgents as $agents)
     {
       foreach ($agents as $agent)
       {
diff --git a/src/Helper/ExceptionHandlerMetadataExtractor.php b/src/Helper/ExceptionHandlerMetadataExtractor.php
@@ -189,7 +189,7 @@ private function extractExceptionClass(\ReflectionClass $reflectionClass, string
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns the basename of a method if the and only if the method is an exception handler.
+   * Returns the basename of a method if and only if the method is an exception handler.
    *
    * @param string $method The name of the method.
    *
diff --git a/src/InvalidUrlExceptionAgent.php b/src/InvalidUrlExceptionAgent.php
@@ -81,7 +81,7 @@ private function handleException(InvalidUrlException $exception): Response
     $this->nub->DL->commit();
 
     // Only on development environment log the error.
-    if ($this->nub->request->isEnvDev())
+    if ($this->nub->request->isEnvDev)
     {
       $this->nub->errorLogger->logError($exception);
     }
diff --git a/src/NotAuthorizedExceptionAgent.php b/src/NotAuthorizedExceptionAgent.php
@@ -80,17 +80,17 @@ private function handleException(NotAuthorizedException $exception): Response
 
       // Redirect the user agent to the login page. After the user has successfully logged on the user agent will be
       // redirected to currently requested URL.
-      $response = new SeeOtherResponse($this->nub->getLoginUrl($this->nub->request->getRequestUri()));
+      $response = new SeeOtherResponse($this->nub->getLoginUrl($this->nub->request->requestUri));
     }
     else
     {
-      // The user is logged on and the user has requested an URL for which the user has no authorization.
+      // The user is logged on and the user has requested a URL for which the user has no authorization.
 
       // Set the HTTP status to 404 (Not Found).
       $response = new NotFoundResponse();
 
       // Only on development environment log the error.
-      if ($this->nub->request->isEnvDev())
+      if ($this->nub->request->isEnvDev)
       {
         $this->nub->errorLogger->logError($exception);
       }
diff --git a/src/ResultExceptionAgent.php b/src/ResultExceptionAgent.php
@@ -36,7 +36,7 @@ public function handleConstructException(ResultException $exception): Response
     $this->nub->DL->commit();
 
     // On a development environment log the exception.
-    if ($this->nub->request->isEnvDev())
+    if ($this->nub->request->isEnvDev)
     {
       $this->nub->errorLogger->logError($exception);
     }
diff --git a/src/ThrowableAgent.php b/src/ThrowableAgent.php
@@ -48,7 +48,7 @@ public function handleFinalizeException(\Throwable $throwable): Response
     {
       $this->nub->DL->rollback();
     }
-    catch (\Throwable $e)
+    catch (\Throwable)
     {
       // Nothing to do.
     }
@@ -93,8 +93,6 @@ public function handleResponseException(\Throwable $throwable): Response
    * Tries to log the error and returns the appropriate response object.
    *
    * @param \Throwable $throwable The throwable.
-   *
-   * @return HtmlResponse|InternalServerErrorResponse
    */
   private function errorLoggerResponse(\Throwable $throwable): Response
   {
@@ -104,12 +102,12 @@ private function errorLoggerResponse(\Throwable $throwable): Response
       $this->nub->errorLogger->logError($throwable);
       $contents = $ob->getClean();
     }
-    catch (\Throwable $e)
+    catch (\Throwable)
     {
       // Nothing to do.
     }
 
-    if ($this->nub->request->isEnvDev() && isset($contents) && $contents!=='')
+    if ($this->nub->request->isEnvDev && isset($contents) && $contents!=='')
     {
       $response = new HtmlResponse($contents);
       $response->setStatus(BaseResponse::STATUS_CODE_INTERNAL_SERVER_ERROR);
@@ -139,7 +137,7 @@ private function handleException(\Throwable $throwable): Response
       $this->nub->requestLogger->logRequest(BaseResponse::STATUS_CODE_INTERNAL_SERVER_ERROR);
       $this->nub->DL->commit();
     }
-    catch (\Throwable $e)
+    catch (\Throwable)
     {
       // Noting to do.
     }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private function handleException(BadRequestException $exception): Response`
`81`	`81`	`$this->nub->DL->commit();`
`82`	`82`
`83`	`83`	`// Only on development environment log the error.`
`84`		`- if ($this->nub->request->isEnvDev())`
	`84`	`+ if ($this->nub->request->isEnvDev)`
`85`	`85`	`{`
`86`	`86`	`$this->nub->errorLogger->logError($exception);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class GenerateExceptionHandlerCommand extends PlaisioCommand`
`21`	`21`	`/**`
`22`	`22`	`* @inheritdoc`
`23`	`23`	`*/`
`24`		`- protected function configure()`
	`24`	`+ protected function configure(): void`
`25`	`25`	`{`
`26`	`26`	`$this->setName('plaisio:generate-core-exception-handler')`
`27`	`27`	`->setDescription('Generates the code for the core\'s exception handler');`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function handleConstructException(DecodeException $exception): Response`
`31`	`31`
`32`	`32`	`//--------------------------------------------------------------------------------------------------------------------`
`33`	`33`	`/**`
`34`		`- * Handles a DecodeException thrown thrown during the preparation phase.`
	`34`	`+ * Handles a DecodeException thrown during the preparation phase.`
`35`	`35`	`*`
`36`	`36`	`* @param DecodeException $exception The exception.`
`37`	`37`	`*`
`@@ -81,7 +81,7 @@ private function handleException(DecodeException $exception): Response`
`81`	`81`	`$this->nub->DL->commit();`
`82`	`82`
`83`	`83`	`// Only on development environment log the error.`
`84`		`- if ($this->nub->request->isEnvDev())`
	`84`	`+ if ($this->nub->request->isEnvDev)`
`85`	`85`	`{`
`86`	`86`	`$this->nub->errorLogger->logError($exception);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private function generateTrailer(): void`
`176`	`176`	`*/`
`177`	`177`	`private function importClasses(array $allAgents): void`
`178`	`178`	`{`
`179`		`- foreach ($allAgents as $name => $agents)`
	`179`	`+ foreach ($allAgents as $agents)`
`180`	`180`	`{`
`181`	`181`	`foreach ($agents as $agent)`
`182`	`182`	`{`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private function extractExceptionClass(\ReflectionClass $reflectionClass, string`
`189`	`189`
`190`	`190`	`//--------------------------------------------------------------------------------------------------------------------`
`191`	`191`	`/**`
`192`		`- * Returns the basename of a method if the and only if the method is an exception handler.`
	`192`	`+ * Returns the basename of a method if and only if the method is an exception handler.`
`193`	`193`	`*`
`194`	`194`	`* @param string $method The name of the method.`
`195`	`195`	`*`
Original file line number	Diff line number	Diff line change
`@@ -80,17 +80,17 @@ private function handleException(NotAuthorizedException $exception): Response`
`80`	`80`
`81`	`81`	`// Redirect the user agent to the login page. After the user has successfully logged on the user agent will be`
`82`	`82`	`// redirected to currently requested URL.`
`83`		`- $response = new SeeOtherResponse($this->nub->getLoginUrl($this->nub->request->getRequestUri()));`
	`83`	`+ $response = new SeeOtherResponse($this->nub->getLoginUrl($this->nub->request->requestUri));`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- // The user is logged on and the user has requested an URL for which the user has no authorization.`
	`87`	`+ // The user is logged on and the user has requested a URL for which the user has no authorization.`
`88`	`88`
`89`	`89`	`// Set the HTTP status to 404 (Not Found).`
`90`	`90`	`$response = new NotFoundResponse();`
`91`	`91`
`92`	`92`	`// Only on development environment log the error.`
`93`		`- if ($this->nub->request->isEnvDev())`
	`93`	`+ if ($this->nub->request->isEnvDev)`
`94`	`94`	`{`
`95`	`95`	`$this->nub->errorLogger->logError($exception);`
`96`	`96`	`}`