[2.x] New version

Laragear · Mar 6, 2024 · e6eea6c · e6eea6c
2 parents 28f6d4d + 7942fd3
commit e6eea6c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "symfony/finder": "7.*",
+        "symfony/finder": "6.*|7.*",
         "illuminate/config": "10.*|11.*",
         "illuminate/console": "10.*|11.*",
         "illuminate/contracts": "10.*|11.*",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <exclude>
-      <file>src/Opcache.php</file>
-    </exclude>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -18,4 +12,12 @@
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory>src/</directory>
+    </include>
+    <exclude>
+      <file>src/Opcache.php</file>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/Condition.php b/src/Condition.php
@@ -23,7 +23,7 @@ public function __construct(protected ApplicationContract $app, protected Closur
     /**
      * Use a callback for the condition.
      *
-     * @param  \Closure(\Illuminate\Http\Request, \Symfony\Component\HttpFoundation\Response, array):bool  $callback
+     * @param  \Closure():bool  $callback
      */
     public function use(Closure $callback): void
     {
@@ -47,7 +47,7 @@ public function shouldGenerate(Request $request, Response $response): bool
      *
      * Ensure your 'condition' array contains a 'store', 'key' and 'hits' keys.
      *
-     * @return \Closure(array{int, mixed}, \Illuminate\Contracts\Cache\Factory):bool
+     * @return \Closure():bool
      */
     public static function countCondition(): Closure
     {

diff --git a/src/Lister/Pipes/NormalizeList.php b/src/Lister/Pipes/NormalizeList.php
@@ -12,7 +12,6 @@ class NormalizeList
      */
     public function handle(Listing $listing, Closure $next): Listing
     {
-        // @phpstan-ignore-next-line
         $listing->files = $listing->files->keys();
 
         return $next($listing);

diff --git a/src/Preloader.php b/src/Preloader.php
@@ -45,7 +45,7 @@ public function __construct(
      *
      * @param  (\Closure(\Symfony\Component\Finder\Finder):void)|string  ...$exclude
      */
-    public function exclude(string ...$exclude): void
+    public function exclude(Closure|string ...$exclude): void
     {
         $this->exclude = $this->normalizeListing($exclude);
     }
@@ -55,7 +55,7 @@ public function exclude(string ...$exclude): void
      *
      * @param  (\Closure(\Symfony\Component\Finder\Finder):void)|string  ...$append
      */
-    public function append(Closure | string ...$append): void
+    public function append(Closure|string ...$append): void
     {
         $this->append = $this->normalizeListing($append);
     }