Merge remote-tracking branch 'origin/1.x' into 1.x

DarkGhostHunter · DarkGhostHunter · commit bb14248de17f · 2022-02-16T01:44:23.000-03:00
diff --git a/config/preload.php b/config/preload.php
@@ -31,7 +31,7 @@
     'condition' => [
         'store' => null,
         'hits' => 10000,
-        'key' => 'preload|request_count'
+        'key' => 'preload|request_count',
     ],
 
     /*
diff --git a/src/Compiler/Pipes/FireEvent.php b/src/Compiler/Pipes/FireEvent.php
@@ -4,10 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Collection;
 use Laragear\Preload\Events\PreloadGenerated;
-use Laragear\Preload\Exceptions\PreloadException;
 use Laragear\Preload\Listing;
 
 class FireEvent
diff --git a/src/Compiler/Pipes/LoadPreloadStub.php b/src/Compiler/Pipes/LoadPreloadStub.php
@@ -46,7 +46,7 @@ protected function stubContents(): string
         try {
             return $this->files->get(Preloader::STUB);
         } catch (FileNotFoundException $e) {
-            throw new PreloadException('Cannot read the stub "' . Preloader::STUB . '" contents.', $e->getCode(), $e);
+            throw new PreloadException('Cannot read the stub "'.Preloader::STUB.'" contents.', $e->getCode(), $e);
         }
     }
 }
diff --git a/src/Compiler/Pipes/UpdateListingConfig.php b/src/Compiler/Pipes/UpdateListingConfig.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Config\Repository as ConfigContract;
-use Illuminate\Support\Facades\Config;
 use Laragear\Preload\Listing;
 
 class UpdateListingConfig
@@ -53,7 +52,7 @@ protected function listConfig(Listing $listing): array
                 $listing->memory ? $listing->memory.' MB' : '(disabled)',
                 $listing->appendCount,
                 $listing->excludeCount,
-            ]
+            ],
         ];
     }
 }
diff --git a/src/Compiler/Pipes/UpdateListingFiles.php b/src/Compiler/Pipes/UpdateListingFiles.php
@@ -18,8 +18,8 @@ class UpdateListingFiles
     public function handle(Listing $listing, Closure $next): Listing
     {
         $listing->output = $listing->output->replace('@list',
-            PHP_EOL .
-            '    ' . "'" . $listing->files->implode("'," . PHP_EOL . "    '") . "'" .
+            PHP_EOL.
+            '    '."'".$listing->files->implode("',".PHP_EOL."    '")."'".
             PHP_EOL
         );
 
diff --git a/src/Compiler/Pipes/UpdateListingStatistics.php b/src/Compiler/Pipes/UpdateListingStatistics.php
@@ -60,11 +60,11 @@ protected function statistics(Listing $listing): array
                 $listing->path,
                 now()->toDateTimeString(),
                 $this->config->get('preload.use_require')
-                    ? 'require_once \'' . realpath($this->config->get('preload.autoloader')).'\';'
+                    ? 'require_once \''.realpath($this->config->get('preload.autoloader')).'\';'
                     : null,
                 $this->config->get('preload.ignore_not_found') ? 'continue;' : 'throw new \Exception("{$file} does not exist or is unreadable.");',
                 $this->config->get('preload.use_require') ? 'require_once $file' : 'opcache_compile_file($file)',
-            ]
+            ],
         ];
     }
 
diff --git a/src/Compiler/Pipes/UpdateOpcacheConfig.php b/src/Compiler/Pipes/UpdateOpcacheConfig.php
@@ -46,7 +46,7 @@ protected function opcacheConfig(array $opcache): array
                 $opcache['opcache_statistics']['num_cached_scripts'],
                 number_format($opcache['opcache_statistics']['opcache_hit_rate'], 2, '.', ''),
                 $opcache['opcache_statistics']['misses'],
-            ]
+            ],
         ];
     }
 }
diff --git a/src/Console/Commands/Placeholder.php b/src/Console/Commands/Placeholder.php
@@ -7,7 +7,6 @@
 use Illuminate\Filesystem\Filesystem;
 use JetBrains\PhpStorm\Pure;
 use Laragear\Preload\Preloader;
-use function php_ini_loaded_file;
 
 class Placeholder extends Command
 {
@@ -43,15 +42,17 @@ public function handle(Filesystem $file, ConfigContract $config): void
     {
         $path = $config->get('preload.path');
 
-        $this->comment('Generating a preload placeholder at: ' . $path);
+        $this->comment('Generating a preload placeholder at: '.$path);
         $this->newLine();
 
         if ($file->exists($path)) {
             if ($this->isPlaceholder($file, $path)) {
                 $this->info('A placeholder preload script already exists, no need to generate it again.');
+
                 return;
             } elseif ($this->deniesOverwrite()) {
                 $this->warn('A preload script already exists, skipping.');
+
                 return;
             }
         }
diff --git a/src/Facades/Preload.php b/src/Facades/Preload.php
@@ -13,7 +13,6 @@
  * @method static \Laragear\Preload\Listing list()
  * @method static \Laragear\Preload\Listing generate(\Laragear\Preload\Listing $listing = null)
  * @method static \Illuminate\Support\Collection getFilesFromFinder(\Closure $callback)
- *
  * @method static \Laragear\Preload\Preloader getFacadeRoot()
  *
  * @see \Laragear\Preload\Preloader
diff --git a/src/Http/Middleware/PreloadMiddleware.php b/src/Http/Middleware/PreloadMiddleware.php
@@ -8,8 +8,8 @@
 use Laragear\Preload\Condition;
 use Laragear\Preload\Facades\Preload;
 use Laragear\Preload\Jobs\StorePreloadScript;
-use Symfony\Component\HttpFoundation\Response;
 use function resolve;
+use Symfony\Component\HttpFoundation\Response;
 
 class PreloadMiddleware
 {
@@ -18,7 +18,6 @@ class PreloadMiddleware
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     *
      * @return mixed
      */
     public function handle(Request $request, Closure $next): mixed
@@ -31,14 +30,13 @@ public function handle(Request $request, Closure $next): mixed
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Symfony\Component\HttpFoundation\Response  $response
-     *
      * @return void
      */
     public function terminate(Request $request, Response $response)
     {
         if ($response->isSuccessful() && $this->conditionIsTrue($request, $response)) {
             $config = Config::get([
-                'preload.job.connection', 'preload.job.queue'
+                'preload.job.connection', 'preload.job.queue',
             ]);
 
             StorePreloadScript::dispatch(Preload::list())
diff --git a/src/Jobs/StorePreloadScript.php b/src/Jobs/StorePreloadScript.php
@@ -8,7 +8,6 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
-use Illuminate\Support\Facades\Config;
 use Laragear\Preload\Listing;
 use Laragear\Preload\Preloader;
 
diff --git a/src/Lister/Pipes/CutListByMemoryLimit.php b/src/Lister/Pipes/CutListByMemoryLimit.php
@@ -32,10 +32,10 @@ public function handle(Listing $listing, Closure $next): Listing
      */
     protected function cutList(Listing $listing): void
     {
-        $limit = (int) round($listing->memory * 1024**2);
+        $limit = (int) round($listing->memory * 1024 ** 2);
 
         $listing->files = $listing->files->takeUntil(
-            static function (array $file) use ($listing, $limit, &$memory): bool {
+            static function (array $file) use ($limit, &$memory): bool {
                 $memory += $file['memory_consumption'];
 
                 return $memory > $limit;
diff --git a/src/Listing.php b/src/Listing.php
@@ -32,8 +32,7 @@ public function __construct(
         public string $path = '',
         public ?Stringable $output = null,
         public array $opcache = [],
-    )
-    {
+    ) {
         //
     }
 }
diff --git a/src/Opcache.php b/src/Opcache.php
@@ -2,11 +2,11 @@
 
 namespace Laragear\Preload;
 
-use RuntimeException;
 use function function_exists;
+use RuntimeException;
 
 /**
- * Class Opcache
+ * Class Opcache.
  *
  * This is just a class to enable mocking for testing.
  *
@@ -25,6 +25,7 @@ class Opcache
      * Get status information about the cache.
      *
      * @see https://www.php.net/manual/en/function.opcache-get-status.php
+     *
      * @return array
      */
     public function getStatus(): array
diff --git a/src/PreloadServiceProvider.php b/src/PreloadServiceProvider.php
@@ -38,7 +38,6 @@ public function register(): void
      *
      * @param  \Illuminate\Contracts\Config\Repository  $config
      * @param  \Illuminate\Contracts\Http\Kernel  $kernel
-     *
      * @return void
      */
     public function boot(Repository $config, Kernel $kernel): void
diff --git a/src/Preloader.php b/src/Preloader.php
@@ -5,10 +5,10 @@
 use Closure;
 use Illuminate\Contracts\Config\Repository as ConfigContract;
 use Illuminate\Support\Collection;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\SplFileInfo;
 use function is_string;
 use function resolve;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 class Preloader
 {
@@ -130,5 +130,4 @@ public function getFilesFromFinder(Closure $callback): Collection
             return $file->getRealPath();
         });
     }
-
 }
diff --git a/tests/Compiler/CompilerTest.php b/tests/Compiler/CompilerTest.php
@@ -37,8 +37,8 @@ protected function setUp(): void
 
     protected function getFilesAsString(): string
     {
-        return PHP_EOL .
-            '    ' . "'" . $this->list->files->implode("'," . PHP_EOL . "    '") . "'" .
+        return PHP_EOL.
+            '    '."'".$this->list->files->implode("',".PHP_EOL."    '")."'".
             PHP_EOL;
     }
 
@@ -125,6 +125,7 @@ public function test_generates_script_in_path(): void
 
         $event->assertDispatched(PreloadGenerated::class, function (PreloadGenerated $event): bool {
             static::assertSame($this->list, $event->listing);
+
             return true;
         });
     }
@@ -238,7 +239,7 @@ public function test_exception_when_destination_is_not_writable(): void
     public function test_exception_when_stub_not_readable(): void
     {
         $this->expectException(PreloadException::class);
-        $this->expectExceptionMessage('Cannot read the stub "' . Preloader::STUB . '" contents.');
+        $this->expectExceptionMessage('Cannot read the stub "'.Preloader::STUB.'" contents.');
 
         File::shouldReceive('get')->with(Preloader::STUB)
             ->andThrow(new FileNotFoundException('foo bar'));
@@ -250,7 +251,7 @@ public function test_exception_when_use_require_with_autoloader_missing()
     {
         $this->expectException(PreloadException::class);
         $this->expectExceptionMessage(
-            'Composer Autoloader is missing in \'' . base_path('vendor/autoload.php') .'\''
+            'Composer Autoloader is missing in \''.base_path('vendor/autoload.php').'\''
         );
 
         $this->app->make('config')->set('preload.use_require', true);
diff --git a/tests/ConditionTest.php b/tests/ConditionTest.php
@@ -34,6 +34,7 @@ public function test_allows_custom_condition(): void
 
         $condition = function () use (&$called) {
             $called = true;
+
             return true;
         };
 
diff --git a/tests/Http/Middleware/PreloadMiddlewareTest.php b/tests/Http/Middleware/PreloadMiddlewareTest.php
@@ -35,6 +35,7 @@ public function test_creates_list_when_condition_is_true(): void
 
         $bus->assertDispatched(StorePreloadScript::class, static function (StorePreloadScript $job) use ($listing): bool {
             static::assertSame($listing, $job->listing);
+
             return true;
         });
     }
diff --git a/tests/Lister/ListerTest.php b/tests/Lister/ListerTest.php
@@ -27,7 +27,7 @@ public function test_list(): void
             'external/foo.php' => [ // 3
                 'hits' => 20,
                 'memory_consumption' => 1024,
-                'last_used_timestamp' => 1400000000
+                'last_used_timestamp' => 1400000000,
             ],
         ]);
 
diff --git a/tests/MocksOpcache.php b/tests/MocksOpcache.php
@@ -3,7 +3,6 @@
 namespace Tests;
 
 use Laragear\Preload\Opcache;
-use Mockery\MockInterface;
 
 trait MocksOpcache
 {
@@ -13,33 +12,33 @@ protected function list(): array
             base_path('foo.php') => [ // 3
                 'hits' => 10,
                 'memory_consumption' => 1024 ** 2,
-                'last_used_timestamp' => 1400000000
+                'last_used_timestamp' => 1400000000,
             ],
             base_path('bar.php') => [ // 1
                 'hits' => 20,
                 'memory_consumption' => 3 * (1024 ** 2),
-                'last_used_timestamp' => 1400000002
+                'last_used_timestamp' => 1400000002,
             ],
             base_path('quz.php') => [ // 2
                 'hits' => 20,
                 'memory_consumption' => 5 * (1024 ** 2),
-                'last_used_timestamp' => 1400000001
+                'last_used_timestamp' => 1400000001,
             ],
             base_path('qux.php') => [ // 4
                 'hits' => 5,
                 'memory_consumption' => 5 * (1024 ** 2),
-                'last_used_timestamp' => 1400000010
+                'last_used_timestamp' => 1400000010,
             ],
             base_path('baz.php') => [ // 5
                 'hits' => 5,
                 'memory_consumption' => 6 * (1024 ** 2),
-                'last_used_timestamp' => 1400000010
+                'last_used_timestamp' => 1400000010,
             ],
             'external/quuz.php' => [ // 5
                 'hits' => 15,
                 'memory_consumption' => 7 * (1024 ** 2),
-                'last_used_timestamp' => 1400000015
-            ]
+                'last_used_timestamp' => 1400000015,
+            ],
         ];
     }
 
@@ -51,8 +50,8 @@ public function mockOpcache(iterable $files = []): array
 
         $opcache->allows('getMemoryUsage')->once()
             ->andReturn($memoryUsage = [
-                'used_memory' => 48 * 1024**2,
-                'free_memory' => 80 * 1024**2,
+                'used_memory' => 48 * 1024 ** 2,
+                'free_memory' => 80 * 1024 ** 2,
                 'wasted_memory' => 0,
             ]);
 
diff --git a/tests/PreloaderTest.php b/tests/PreloaderTest.php
@@ -23,6 +23,7 @@ public function test_adds_to_exclusion(): void
             static::assertCount(2, $listing->exclude);
             static::assertInstanceOf(Closure::class, $listing->exclude[0]);
             static::assertInstanceOf(Closure::class, $listing->exclude[1]);
+
             return true;
         })->andReturnSelf();
 
@@ -36,6 +37,7 @@ public function test_adds_to_exclusion(): void
 
         static::assertSame(['foo', 'bar'], $list->files->all());
     }
+
     public function test_adds_to_append(): void
     {
         $lister = $this->mock(Lister::class);
@@ -44,6 +46,7 @@ public function test_adds_to_append(): void
             static::assertCount(2, $listing->append);
             static::assertInstanceOf(Closure::class, $listing->append[0]);
             static::assertInstanceOf(Closure::class, $listing->append[1]);
+
             return true;
         })->andReturnSelf();
 
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -16,7 +16,7 @@ class ServiceProviderTest extends TestCase
     public function test_merges_config(): void
     {
         static::assertSame(
-            $this->app->make('files')->getRequire(__DIR__ . '/../config/preload.php'),
+            $this->app->make('files')->getRequire(__DIR__.'/../config/preload.php'),
             $this->app->make('config')->get('preload')
         );
     }
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected function stubContents(): string`
`46`	`46`	`try {`
`47`	`47`	`return $this->files->get(Preloader::STUB);`
`48`	`48`	`} catch (FileNotFoundException $e) {`
`49`		`- throw new PreloadException('Cannot read the stub "' . Preloader::STUB . '" contents.', $e->getCode(), $e);`
	`49`	`+ throw new PreloadException('Cannot read the stub "'.Preloader::STUB.'" contents.', $e->getCode(), $e);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use Closure;`
`6`	`6`	`use Illuminate\Contracts\Config\Repository as ConfigContract;`
`7`		`-use Illuminate\Support\Facades\Config;`
`8`	`7`	`use Laragear\Preload\Listing;`
`9`	`8`
`10`	`9`	`class UpdateListingConfig`
`@@ -53,7 +52,7 @@ protected function listConfig(Listing $listing): array`
`53`	`52`	`$listing->memory ? $listing->memory.' MB' : '(disabled)',`
`54`	`53`	`$listing->appendCount,`
`55`	`54`	`$listing->excludeCount,`
`56`		`- ]`
	`55`	`+ ],`
`57`	`56`	`];`
`58`	`57`	`}`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected function opcacheConfig(array $opcache): array`
`46`	`46`	`$opcache['opcache_statistics']['num_cached_scripts'],`
`47`	`47`	`number_format($opcache['opcache_statistics']['opcache_hit_rate'], 2, '.', ''),`
`48`	`48`	`$opcache['opcache_statistics']['misses'],`
`49`		`- ]`
	`49`	`+ ],`
`50`	`50`	`];`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`use Illuminate\Filesystem\Filesystem;`
`8`	`8`	`use JetBrains\PhpStorm\Pure;`
`9`	`9`	`use Laragear\Preload\Preloader;`
`10`		`-use function php_ini_loaded_file;`
`11`	`10`
`12`	`11`	`class Placeholder extends Command`
`13`	`12`	`{`
`@@ -43,15 +42,17 @@ public function handle(Filesystem $file, ConfigContract $config): void`
`43`	`42`	`{`
`44`	`43`	`$path = $config->get('preload.path');`
`45`	`44`
`46`		`- $this->comment('Generating a preload placeholder at: ' . $path);`
	`45`	`+ $this->comment('Generating a preload placeholder at: '.$path);`
`47`	`46`	`$this->newLine();`
`48`	`47`
`49`	`48`	`if ($file->exists($path)) {`
`50`	`49`	`if ($this->isPlaceholder($file, $path)) {`
`51`	`50`	`$this->info('A placeholder preload script already exists, no need to generate it again.');`
	`51`	`+`
`52`	`52`	`return;`
`53`	`53`	`} elseif ($this->deniesOverwrite()) {`
`54`	`54`	`$this->warn('A preload script already exists, skipping.');`
	`55`	`+`
`55`	`56`	`return;`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`* @method static \Laragear\Preload\Listing list()`
`14`	`14`	`* @method static \Laragear\Preload\Listing generate(\Laragear\Preload\Listing $listing = null)`
`15`	`15`	`* @method static \Illuminate\Support\Collection getFilesFromFinder(\Closure $callback)`
`16`		`- *`
`17`	`16`	`* @method static \Laragear\Preload\Preloader getFacadeRoot()`
`18`	`17`	`*`
`19`	`18`	`* @see \Laragear\Preload\Preloader`