initial commit for fork of the Slim framework

- fixes in tests
- fixes in code

Author: sfilatov-idt

.gitignore

@@ -4,3 +4,4 @@ coverage
 vendor
 .DS_Store
 .idea
+.phpunit.result.cache

README.md

@@ -16,7 +16,7 @@ It's recommended that you use [Composer](https://getcomposer.org/) to install Sl
 $ composer require slim/slim "^3.0"
 ```
 
-This will install Slim and all required dependencies. Slim requires PHP 5.5.0 or newer.
+This will install Slim and all required dependencies. Slim requires PHP 8.0.0 or newer.
 
 ## Usage
 

Slim/App.php

@@ -661,9 +661,10 @@ protected function isEmptyResponse(ResponseInterface $response)
      *
      * @return bool
      */
-    protected function isHeadRequest(RequestInterface $request)
+    protected function isHeadRequest(RequestInterface $request): bool
     {
-        return strtoupper($request->getMethod()) === 'HEAD';
+        $method = $request->getMethod();
+        return strtoupper(isset($method) ? $method : '') === 'HEAD';
     }
 
     /**

Slim/Collection.php

@@ -109,7 +109,7 @@ public function clear()
      *
      * @return bool
      */
-    public function offsetExists($key)
+    public function offsetExists($key): bool
     {
         return $this->has($key);
     }
@@ -121,7 +121,7 @@ public function offsetExists($key)
      *
      * @return mixed The key's value, or the default value
      */
-    public function offsetGet($key)
+    public function offsetGet($key): mixed
     {
         return $this->get($key);
     }
@@ -132,7 +132,7 @@ public function offsetGet($key)
      * @param string $key   The data key
      * @param mixed  $value The data value
      */
-    public function offsetSet($key, $value)
+    public function offsetSet($key, $value): void
     {
         $this->set($key, $value);
     }
@@ -142,7 +142,7 @@ public function offsetSet($key, $value)
      *
      * @param string $key The data key
      */
-    public function offsetUnset($key)
+    public function offsetUnset($key): void
     {
         $this->remove($key);
     }
@@ -152,7 +152,7 @@ public function offsetUnset($key)
      *
      * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->data);
     }
@@ -162,7 +162,7 @@ public function count()
      *
      * @return ArrayIterator
      */
-    public function getIterator()
+    public function getIterator(): ArrayIterator
     {
         return new ArrayIterator($this->data);
     }

Slim/Container.php

@@ -70,7 +70,7 @@ public function __construct(array $values = [])
      *
      * @return void
      */
-    private function registerDefaultServices($userSettings)
+    private function registerDefaultServices($userSettings): void
     {
         $defaultSettings = $this->defaultSettings;
 
@@ -100,7 +100,7 @@ private function registerDefaultServices($userSettings)
      * @throws ContainerValueNotFoundException  No entry was found for this identifier.
      * @throws ContainerExceptionInterface      Error while retrieving the entry.
      */
-    public function get($id)
+    public function get($id): mixed
     {
         if (!$this->offsetExists($id)) {
             throw new ContainerValueNotFoundException(sprintf('Identifier "%s" is not defined.', $id));
@@ -111,7 +111,7 @@ public function get($id)
             if ($this->exceptionThrownByContainer($exception)) {
                 throw new SlimContainerException(
                     sprintf('Container error while retrieving "%s"', $id),
-                    null,
+                    0,
                     $exception
                 );
             } else {
@@ -128,7 +128,7 @@ public function get($id)
      *
      * @return bool
      */
-    private function exceptionThrownByContainer(InvalidArgumentException $exception)
+    private function exceptionThrownByContainer(InvalidArgumentException $exception): bool
     {
         $trace = $exception->getTrace()[0];
 
@@ -143,7 +143,7 @@ private function exceptionThrownByContainer(InvalidArgumentException $exception)
      *
      * @return boolean
      */
-    public function has($id)
+    public function has($id): bool
     {
         return $this->offsetExists($id);
     }

Slim/Handlers/AbstractError.php

@@ -32,7 +32,7 @@ public function __construct($displayErrorDetails = false)
      *
      * @return void
      */
-    protected function writeToErrorLog($throwable)
+    protected function writeToErrorLog($throwable): void
     {
         if ($this->displayErrorDetails) {
             return;
@@ -57,7 +57,7 @@ protected function writeToErrorLog($throwable)
      *
      * @return string
      */
-    protected function renderThrowableAsText($throwable)
+    protected function renderThrowableAsText($throwable): string
     {
         $text = sprintf('Type: %s' . PHP_EOL, get_class($throwable));