declare types

slimphp · Dec 28, 2021 · 672742d · 672742d
1 parent dc1296c
commit 672742d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 51 deletions.
diff --git a/src/Twig.php b/src/Twig.php
@@ -46,24 +46,20 @@ class Twig implements ArrayAccess
 {
     /**
      * Twig loader
-     *
-     * @var LoaderInterface
      */
-    protected $loader;
+    protected LoaderInterface $loader;
 
     /**
      * Twig environment
-     *
-     * @var Environment
      */
-    protected $environment;
+    protected Environment $environment;
 
     /**
      * Default view variables
      *
      * @var array<string, mixed>
      */
-    protected $defaultVariables = [];
+    protected array $defaultVariables = [];
 
     /**
      * @param ServerRequestInterface $request

diff --git a/src/TwigMiddleware.php b/src/TwigMiddleware.php
@@ -20,25 +20,13 @@
 
 class TwigMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var Twig
-     */
-    protected $twig;
+    protected Twig $twig;
 
-    /**
-     * @var RouteParserInterface
-     */
-    protected $routeParser;
+    protected RouteParserInterface $routeParser;
 
-    /**
-     * @var string
-     */
-    protected $basePath;
+    protected string $basePath;
 
-    /**
-     * @var string|null
-     */
-    protected $attributeName;
+    protected ?string $attributeName;
 
     /**
      * @param App    $app

diff --git a/src/TwigRuntimeExtension.php b/src/TwigRuntimeExtension.php
@@ -15,20 +15,11 @@
 
 class TwigRuntimeExtension
 {
-    /**
-     * @var RouteParserInterface
-     */
-    protected $routeParser;
+    protected RouteParserInterface $routeParser;
 
-    /**
-     * @var string
-     */
-    protected $basePath = '';
+    protected string $basePath = '';
 
-    /**
-     * @var UriInterface
-     */
-    protected $uri;
+    protected UriInterface $uri;
 
     /**
      * @param RouteParserInterface $routeParser Route parser

diff --git a/src/TwigRuntimeLoader.php b/src/TwigRuntimeLoader.php
@@ -16,20 +16,11 @@
 
 class TwigRuntimeLoader implements RuntimeLoaderInterface
 {
-    /**
-     * @var RouteParserInterface
-     */
-    protected $routeParser;
+    protected RouteParserInterface $routeParser;
 
-    /**
-     * @var UriInterface
-     */
-    protected $uri;
+    protected UriInterface $uri;
 
-    /**
-     * @var string
-     */
-    protected $basePath = '';
+    protected string $basePath = '';
 
     /**
      * TwigRuntimeLoader constructor.

diff --git a/tests/TwigRuntimeExtensionTest.php b/tests/TwigRuntimeExtensionTest.php
@@ -66,7 +66,7 @@ protected function mapRouteCollectorRoute(
         return $route;
     }
 
-    public function isCurrentUrlProvider()
+    public function isCurrentUrlProvider(): array
     {
         return [
             ['/hello/{name}', ['name' => 'world'], '/hello/world', '/base-path', true],
@@ -109,7 +109,7 @@ public function testIsCurrentUrl(string $pattern, array $data, string $path, ?st
         $this->assertEquals($expected, $result);
     }
 
-    public function currentUrlProvider()
+    public function currentUrlProvider(): array
     {
         return [
             ['/hello/{name}', 'http://example.com/hello/world?a=b', '', true],
@@ -164,7 +164,7 @@ public function testCurrentUrl(string $pattern, string $url, string $basePath, b
         $this->assertEquals($expected, $result);
     }
 
-    public function urlForProvider()
+    public function urlForProvider(): array
     {
         return [
             ['/hello/{name}', ['name' => 'world'], [], '', '/hello/world'],
@@ -204,7 +204,7 @@ public function testUrlFor(
         $this->assertEquals($expectedUrl, $extension->urlFor($routeName, $routeData, $queryParams));
     }
 
-    public function fullUrlForProvider()
+    public function fullUrlForProvider(): array
     {
         return [
             ['/hello/{name}', ['name' => 'world'], [], '', 'http://localhost/hello/world'],