laravel 8 while we're at it

Author: troyxmccall

Assets/JsonManifest.php

@@ -18,23 +18,21 @@ class JsonManifest implements ManifestInterface
     /**
      * JsonManifest constructor
      *
-     * @param string $manifestPath Local filesystem path to JSON-encoded manifest
-     * @param string $distUri Remote URI to assets root
+     * @param  string  $manifestPath  Local filesystem path to JSON-encoded manifest
+     * @param  string  $distUri  Remote URI to assets root
      */
     public function __construct($manifestPath, $distUri)
     {
         $this->manifest = file_exists($manifestPath) ? json_decode(file_get_contents($manifestPath), true) : [];
         $this->dist = $distUri;
     }
 
-    /** @inheritdoc */
-    public function get($asset)
+    public function get($asset): string
     {
         return isset($this->manifest[$asset]) ? $this->manifest[$asset] : $asset;
     }
 
-    /** @inheritdoc */
-    public function getUri($asset)
+    public function getUri($asset): string
     {
         return "{$this->dist}/{$this->get($asset)}";
     }

Assets/ManifestInterface.php

@@ -17,7 +17,7 @@ interface ManifestInterface
      * @param string $asset The original name of the file before cache-busting
      * @return string
      */
-    public function get($asset);
+    public function get($asset): string;
 
     /**
      * Get the cache-busted URI
@@ -27,5 +27,5 @@ public function get($asset);
      * @param string $asset The original name of the file before cache-busting
      * @return string
      */
-    public function getUri($asset);
+    public function getUri($asset): string;
 }

Template/Blade.php

@@ -2,10 +2,8 @@
 
 namespace Roots\Sage\Template;
 
-use Illuminate\Contracts\Container\Container as ContainerContract;
 use Illuminate\Contracts\View\Factory as FactoryContract;
 use Illuminate\View\Engines\CompilerEngine;
-use Illuminate\View\Engines\EngineInterface;
 use Illuminate\View\ViewFinderInterface;
 
 /**
@@ -23,7 +21,6 @@
  */
 class Blade
 {
-    /** @var Factory */
     protected $env;
 
     public function __construct(FactoryContract $env)
@@ -35,39 +32,41 @@ public function __construct(FactoryContract $env)
      * Get the compiler
      *
      * @return \Illuminate\View\Compilers\BladeCompiler
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function compiler()
+    public function compiler(): \Illuminate\View\Compilers\BladeCompiler
     {
         static $engineResolver;
         if (!$engineResolver) {
             $engineResolver = $this->getContainer()->make('view.engine.resolver');
         }
+
         return $engineResolver->resolve('blade')->getCompiler();
     }
 
     /**
-     * @param string $view
-     * @param array  $data
-     * @param array  $mergeData
+     * @param  string  $view
+     * @param  array  $data
+     * @param  array  $mergeData
      * @return string
      */
-    public function render($view, $data = [], $mergeData = [])
+    public function render($view, $data = [], $mergeData = []): string
     {
         /** @var \Illuminate\Contracts\Filesystem\Filesystem $filesystem */
         $filesystem = $this->getContainer()['files'];
+
         return $this->{$filesystem->exists($view) ? 'file' : 'make'}($view, $data, $mergeData)->render();
     }
 
     /**
-     * @param string $file
-     * @param array  $data
-     * @param array  $mergeData
+     * @param  string  $file
+     * @param  array  $data
+     * @param  array  $mergeData
      * @return string
      */
     public function compiledPath($file, $data = [], $mergeData = [])
     {
         $rendered = $this->file($file, $data, $mergeData);
-        /** @var EngineInterface $engine */
         $engine = $rendered->getEngine();
 
         if (!($engine instanceof CompilerEngine)) {
@@ -80,14 +79,15 @@ public function compiledPath($file, $data = [], $mergeData = [])
         if ($compiler->isExpired($compiledPath)) {
             $compiler->compile($file);
         }
+
         return $compiledPath;
     }
 
     /**
-     * @param string $file
+     * @param  string  $file
      * @return string
      */
-    public function normalizeViewPath($file)
+    public function normalizeViewPath($file): string
     {
         // Convert `\` to `/`
         $view = str_replace('\\', '/', $file);
@@ -108,10 +108,10 @@ public function normalizeViewPath($file)
     /**
      * Convert path to view namespace
      *
-     * @param string $path
+     * @param  string  $path
      * @return string
      */
-    public function applyNamespaceToPath($path)
+    public function applyNamespaceToPath($path): string
     {
         /** @var ViewFinderInterface $finder */
         $finder = $this->getContainer()['view.finder'];
@@ -123,13 +123,14 @@ public function applyNamespaceToPath($path)
         $view = array_reduce(array_keys($hints), function ($view, $namespace) use ($delimiter, $hints) {
             return str_replace($hints[$namespace], $namespace.$delimiter, $view);
         }, $path);
+
         return preg_replace("%{$delimiter}[\\/]*%", $delimiter, $view);
     }
 
     /**
      * Pass any method to the view Factory instance.
      *
-     * @param  string $method
+     * @param  string  $method
      * @param  array  $params
      * @return mixed
      */

Template/BladeProvider.php

@@ -14,8 +14,8 @@
 class BladeProvider extends ViewServiceProvider
 {
     /**
-     * @param ContainerContract $container
-     * @param array             $config
+     * @param  ContainerContract  $container
+     * @param  array  $config
      * @SuppressWarnings(PHPMD.StaticAccess)
      */
     public function __construct(ContainerContract $container = null, $config = [])
@@ -65,6 +65,7 @@ public function registerViewFinder()
             $namespaces = $config['view.namespaces'];
             $finder = new FileViewFinder($app['files'], $paths);
             array_map([$finder, 'addNamespace'], array_keys($namespaces), $namespaces);
+
             return $finder;
         }, true);
     }

Template/FileViewFinder.php

@@ -12,14 +12,15 @@ class FileViewFinder extends \Illuminate\View\FileViewFinder
      * @param  string  $name
      * @return array
      */
-    public function getPossibleViewFiles($name)
+    public function getPossibleViewFiles($name): array
     {
         $parts = explode(self::FALLBACK_PARTS_DELIMITER, $name);
         $templates[] = array_shift($parts);
         foreach ($parts as $i => $part) {
             $templates[] = $templates[$i].self::FALLBACK_PARTS_DELIMITER.$part;
         }
         rsort($templates);
+
         return $this->getPossibleViewFilesFromTemplates($templates);
     }
 
@@ -29,7 +30,7 @@ public function getPossibleViewFiles($name)
      * @param array $templates
      * @return array
      */
-    public function getPossibleViewFilesFromTemplates($templates)
+    public function getPossibleViewFilesFromTemplates($templates): array
     {
         return call_user_func_array('array_merge', array_map(function ($template) {
             return array_map(function ($extension) use ($template) {

composer.json

@@ -28,17 +28,25 @@
     }
   },
   "require": {
-    "php": "^8.0",
-    "composer/installers": "~1.0",
-    "illuminate/view": "~7.0",
-    "illuminate/config": "~7.0"
+    "php": "^7.4",
+    "composer/installers": "~2.0",
+    "illuminate/view": "^8.0",
+    "illuminate/config": "^8.0",
+    "illuminate/support": "^8.0",
+    "ext-json": "*"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "~3.5"
+    "squizlabs/php_codesniffer": "~3.5",
+    "friendsofphp/php-cs-fixer": "^3.8"
   },
   "scripts": {
-    "test": [
-      "phpcs --ignore=vendor --extensions=php --standard=PSR2 ."
+    "cs-fix": [
+      "php vendor/bin/php-cs-fixer fix --diff --config=.php_cs.dist.php -vvv"
     ]
+  },
+  "config": {
+    "allow-plugins": {
+      "composer/installers": true
+    }
   }
 }