Merge branch 'roots:main' into fse

.devcontainer/install.sh

@@ -76,11 +76,11 @@ else
   cat /roots/app/composer.json | jq ".repositories += [{ type: \"path\", url: \"${WORKSPACE_FOLDER}\" }]" > /roots/app/composer.tmp \
   && rm /roots/app/composer.json \
   && mv /roots/app/composer.tmp /roots/app/composer.json \
-  && composer require -d /roots/app $(cat "${WORKSPACE_FOLDER}/composer.json" | jq '.name' | tr -d '"') --no-interaction
+  && composer require -d /roots/app $(cat "${WORKSPACE_FOLDER}/composer.json" | jq '.name' | tr -d '"') --no-interaction -W
 fi
 
 composer remove -d /roots/app wpackagist-theme/twentytwentyfour
-composer require -d /roots/app roots/soil
+composer require -d /roots/app roots/acorn-prettify -W
 
 # Set filesystem permissions
 sudo chown -R vscode:www-data /roots/app

README.md

@@ -52,7 +52,6 @@ Acorn is a framework for integrating Laravel within WordPress.
 | illuminate/console       | 🟢 | |
 | illuminate/container     | 🟢 | |
 | illuminate/contracts     | 🟢 | |
-| illuminate/contracts     | 🟢 | |
 | illuminate/database      | 🟢 | |
 | illuminate/encryption    | 🟢 | |
 | illuminate/events        | 🟢 | |

src/Roots/Acorn/Application.php

@@ -135,7 +135,7 @@ protected function bindPathsInContainer()
     /**
      * Get the path to the bootstrap directory.
      *
-     * @param  string  $path Optionally, a path to append to the bootstrap path
+     * @param  string  $path  Optionally, a path to append to the bootstrap path
      * @return string
      */
     public function bootstrapPath($path = '')

src/Roots/Acorn/Assets/Asset/Asset.php

@@ -46,8 +46,8 @@ class Asset implements AssetContract
     /**
      * Get asset from manifest
      *
-     * @param  string  $path Local path
-     * @param  string  $uri Remote URI
+     * @param  string  $path  Local path
+     * @param  string  $uri  Remote URI
      */
     public function __construct(string $path, string $uri)
     {
@@ -86,7 +86,7 @@ public function contents(): string
     /**
      * Get the relative path to the asset.
      *
-     * @param  string  $basePath Base path to use for relative path.
+     * @param  string  $basePath  Base path to use for relative path.
      */
     public function relativePath(string $basePath): string
     {
@@ -112,7 +112,7 @@ public function base64()
     /**
      * Get data URL of asset.
      *
-     * @param  string  $mediatype MIME content type
+     * @param  string  $mediatype  MIME content type
      */
     public function dataUrl(?string $mediatype = null): string
     {
@@ -130,7 +130,7 @@ public function dataUrl(?string $mediatype = null): string
     /**
      * Get data URL of asset.
      *
-     * @param  string  $mediatype MIME content type
+     * @param  string  $mediatype  MIME content type
      */
     public function dataUri(?string $mediatype = null): string
     {

src/Roots/Acorn/Assets/Asset/TextAsset.php

@@ -14,7 +14,7 @@ class TextAsset extends Asset
     /**
      * Get character encoding.
      *
-     * @param  string  $fallback Fallback if charset cannot be determined
+     * @param  string  $fallback  Fallback if charset cannot be determined
      */
     public function charset($fallback = 'UTF-8'): string
     {
@@ -36,9 +36,9 @@ public function charset($fallback = 'UTF-8'): string
     /**
      * Get data URL of asset.
      *
-     * @param  string  $mediatype MIME content type
-     * @param  string  $charset Character encoding
-     * @param  string  $urlencode List of characters to be percent-encoded
+     * @param  string  $mediatype  MIME content type
+     * @param  string  $charset  Character encoding
+     * @param  string  $urlencode  List of characters to be percent-encoded
      */
     public function dataUrl(?string $mediatype = null, ?string $charset = null, string $urlencode = '%\'"'): string
     {
@@ -68,9 +68,9 @@ public function dataUrl(?string $mediatype = null, ?string $charset = null, stri
     /**
      * Get data URL of asset.
      *
-     * @param  string  $mediatype MIME content type
-     * @param  string  $charset Character encoding
-     * @param  string  $urlencode List of characters to be percent-encoded
+     * @param  string  $mediatype  MIME content type
+     * @param  string  $charset  Character encoding
+     * @param  string  $urlencode  List of characters to be percent-encoded
      */
     public function dataUri(?string $mediatype = null, ?string $charset = null, string $urlencode = '%\'"'): string
     {

src/Roots/Acorn/Assets/AssetFactory.php

@@ -13,9 +13,9 @@ class AssetFactory
     /**
      * Create Asset instance.
      *
-     * @param  string  $path Local path
-     * @param  string  $uri Remote URI
-     * @param  string  $type Asset type
+     * @param  string  $path  Local path
+     * @param  string  $uri  Remote URI
+     * @param  string  $type  Asset type
      */
     public static function create(string $path, string $uri, ?string $type = null): AssetContract
     {

src/Roots/Acorn/Assets/Concerns/Enqueuable.php

@@ -183,6 +183,25 @@ public function localize($name, $object)
         return $this;
     }
 
+    /**
+     * Add script translations to be used by the bundle
+     *
+     * @param  string  $domain
+     * @param  string  $path
+     * @return $this
+     */
+    public function translate($domain = null, $path = null)
+    {
+        $domain ??= wp_get_theme()->get('TextDomain');
+        $path ??= lang_path();
+
+        $this->js()->keys()->each(function ($handle) use ($domain, $path) {
+            wp_set_script_translations("{$this->id}/{$handle}", $domain, $path);
+        });
+
+        return $this;
+    }
+
     /**
      * Merge two or more arrays.
      *

src/Roots/Acorn/Assets/Contracts/Asset.php

@@ -33,7 +33,7 @@ public function contents();
     /**
      * Get the relative path to the asset.
      *
-     * @param  string  $base_path Base path to use for relative path.
+     * @param  string  $base_path  Base path to use for relative path.
      */
     public function relativePath(string $base_path): string;
 

src/Roots/Acorn/Assets/Manager.php

@@ -114,7 +114,7 @@ protected function pipeline(array $config): array
     /**
      * Opens a JSON manifest file from the local file system
      *
-     * @param  string  $jsonManifest Path to .json file
+     * @param  string  $jsonManifest  Path to .json file
      */
     protected function getJsonManifest(string $jsonManifest): array
     {

src/Roots/Acorn/Bootloader.php

@@ -238,7 +238,6 @@ protected function handleRequest(
         if (
             $response instanceof \Symfony\Component\HttpFoundation\Response
             && ! $response->isServerError()
-            && $response->getStatusCode() >= 400
         ) {
             return;
         }
@@ -360,8 +359,8 @@ protected function normalizeApplicationPath($path, $default = null)
         }
 
         return Str::startsWith($env, $this->absoluteApplicationPathPrefixes)
-                ? $env
-                : $this->basePath($env);
+            ? $env
+            : $this->basePath($env);
     }
 
     /**

src/Roots/Acorn/Sage/ViewFinder.php

@@ -39,7 +39,7 @@ public function __construct(FileViewFinder $finder, Filesystem $files, $path = '
     {
         $this->finder = $finder;
         $this->files = $files;
-        $this->path = realpath($path ? $path : get_theme_file_path());
+        $this->path = realpath($path ?: get_theme_file_path());
     }
 
     /**
@@ -55,9 +55,10 @@ public function locate($file)
         }
 
         return $this->getRelativeViewPaths()
-            ->flatMap(fn ($viewPath) => collect($this->finder->getPossibleViewFilesFromPath($file))
-                ->merge([$file])
-                ->map(fn ($file) => "{$viewPath}/{$file}")
+            ->flatMap(
+                fn ($viewPath) => collect($this->finder->getPossibleViewFilesFromPath($file))
+                    ->merge([$file])
+                    ->map(fn ($file) => "{$viewPath}/{$file}")
             )
             ->unique()
             ->map(fn ($file) => trim($file, '\\/'))

src/Roots/Acorn/View/FileViewFinder.php

@@ -9,7 +9,7 @@ class FileViewFinder extends FileViewFinderBase
     /**
      * Get possible relative locations of view files
      *
-     * @param  string  $path Absolute or relative path to possible view file
+     * @param  string  $path  Absolute or relative path to possible view file
      * @return string[]
      */
     public function getPossibleViewFilesFromPath($path)
@@ -22,7 +22,7 @@ public function getPossibleViewFilesFromPath($path)
     /**
      * Get possible view name based on path
      *
-     * @param  string  $path Absolute or relative path to possible view file
+     * @param  string  $path  Absolute or relative path to possible view file
      * @return string
      */
     public function getPossibleViewNameFromPath($file)
@@ -60,7 +60,7 @@ public function getPossibleViewNameFromPath($file)
     /**
      * Remove recognized extensions from path
      *
-     * @param  string  $file relative path to view file
+     * @param  string  $file  relative path to view file
      * @return string view name
      */
     protected function stripExtensions($path)

tests/Test/Concerns/SupportsGlobalStubs.php

@@ -11,8 +11,8 @@ trait SupportsGlobalStubs
     /**
      * Create stubs and spies for global functions.
      *
-     * @param  string  $fn       The name of the global function
-     * @param  null|callable  $callable The real function to monitor
+     * @param  string  $fn  The name of the global function
+     * @param  null|callable  $callable  The real function to monitor
      */
     protected function stub(string $fn, ?callable $callable = null): MockeryCallableMock
     {