composer fix-style

.github/workflows/run-tests.yml

@@ -18,16 +18,17 @@ jobs:
       COMPOSER_NO_INTERACTION: 1
 
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-2019]
         php: [8.3, 8.2, 8.1, 8.0]
         laravel: [9.*, 10.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        stability: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.0
             laravel: 10.*
           - php: 8.0
-            dependency-version: prefer-lowest
+            stability: prefer-lowest
     steps:
     - name: Set git to use LF
       if: ${{ matrix.os == 'windows-2019' }}
@@ -50,7 +51,7 @@ jobs:
         composer remove vimeo/psalm --no-update --dev
         composer remove friendsofphp/php-cs-fixer --no-update --dev
         composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
-        composer update --prefer-dist --no-progress
+        composer update --prefer-dist --no-progress --${{ matrix.stability }}
 
     - name: Execute Unit Tests
       run: composer test-ci

CHANGELOG.md

@@ -11,7 +11,6 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 - Add support for enum default arguments using enum cases. [#1464 / d8vjork](https://github.com/barryvdh/laravel-ide-helper/pull/1464)
-- Add support for real-time facades in the helper file. [#1455 / filipac](https://github.com/barryvdh/laravel-ide-helper/pull/1455)
 
 2024-02-05, 2.14.0
 ------------------

README.md

@@ -113,10 +113,6 @@ The generator tries to identify the real class, but if it cannot be found, you c
 Some classes need a working database connection. If you do not have a default working connection, some facades will not be included.
 You can use an in-memory SQLite driver by adding the `-M` option.
 
-If you use [real-time facades](https://laravel.com/docs/master/facades#real-time-facades) in your app, those will also be included in the generated file using a `@mixin` annotation and extending the original class underneath the facade. 
-
-**Note**: this feature uses the generated real-time facades files in the `storage/framework/cache` folder. Those files are generated on-demand as you use the real-time facade, so if the framework has not generated that first, it will not be included in the helper file. Run the route/command/code first and then regenerate the helper file and this time the real-time facade will be included in it.
-
 You can choose to include helper files. This is not enabled by default, but you can override it with the `--helpers (-H)` option.
 The `Illuminate/Support/helpers.php` is already set up, but you can add/remove your own files in the config file.
 

composer.json

@@ -22,9 +22,9 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.0.6",
+        "barryvdh/reflection-docblock": "^2.1.1",
         "composer/class-map-generator": "^1.0",
-        "doctrine/dbal": "^2.6 || ^3.1.4",
+        "doctrine/dbal": "^3.1.4",
         "illuminate/console": "^9 || ^10",
         "illuminate/filesystem": "^9 || ^10",
         "illuminate/support": "^9 || ^10",
@@ -37,6 +37,7 @@
         "illuminate/config": "^9 || ^10",
         "illuminate/view": "^9 || ^10",
         "mockery/mockery": "^1.4",
+        "nesbot/carbon": "^2.62.1",
         "orchestra/testbench": "^7 || ^8",
         "phpunit/phpunit": "^9",
         "spatie/phpunit-snapshot-assertions": "^4",

resources/views/helper.php

@@ -69,16 +69,6 @@ namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
 
 <?php endforeach; ?>
 
-<?php foreach($real_time_facades as $name): ?>
-<?php $nested = explode('\\', str_replace('\\' . class_basename($name), '', $name)); ?>
-namespace <?php echo implode('\\', $nested); ?> {
-    /**
-     * @mixin <?= str_replace('Facades', '', $name) ?>
-     */
-    class <?= class_basename($name) ?> extends <?= str_replace('Facades', '', $name) ?> {}
-}
-<?php endforeach; ?>
-
 <?php if ($helpers) : ?>
 namespace {
     <?= $helpers ?>

src/Generator.php

@@ -16,10 +16,6 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
-use PhpParser\Lexer\Emulative;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\Parser\Php7;
 use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -80,7 +76,6 @@ class Generator
         return $this->view->make('helper')
             ->with('namespaces_by_extends_ns', $this->getAliasesByExtendsNamespace())
             ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
-            ->with('real_time_facades', $this->getRealTimeFacades())
             ->with('helpers', $this->helpers)
             ->with('version', $app->version())
             ->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
@@ -179,51 +174,6 @@ class Generator
         return $aliases;
     }
 
-    protected function getRealTimeFacades()
-    {
-        $facades = [];
-        $realTimeFacadeFiles = glob(storage_path('framework/cache/facade-*.php'));
-        foreach ($realTimeFacadeFiles as $file) {
-            try {
-                $name = $this->getFullyQualifiedClassNameInFile($file);
-                $facades[$name] = $name;
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-
-        return $facades;
-    }
-
-    protected function getFullyQualifiedClassNameInFile(string $path)
-    {
-        $contents = file_get_contents($path);
-
-        $parsers = new Php7(new Emulative());
-
-        $parsed = collect($parsers->parse($contents) ?: []);
-
-        $namespace = $parsed->first(function ($node) {
-            return $node instanceof Namespace_;
-        });
-
-        if ($namespace) {
-            $name = $namespace->name->toString();
-
-            $class = collect($namespace->stmts)->first(function ($node) {
-                return $node instanceof Class_;
-            });
-
-            if ($class) {
-                $name .= '\\' . $class->name->toString();
-            }
-
-            return $name;
-        }
-    }
-
-
-
     /**
      * Regroup aliases by namespace of extended classes
      *

tests/RealTimeFacadesTest.php

@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests;
-
-use Barryvdh\LaravelIdeHelper\Generator;
-use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\View;
-use PhpParser\Lexer\Emulative;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\Parser\Php7;
-
-class RealTimeFacadesTest extends TestCase
-{
-    public function testRealTimeFacades()
-    {
-        // Add the views path to the view finder so the generator actually generates the file
-        View::addLocation(__DIR__ . '/../resources/views');
-
-        // Clear cached real-time facades
-        $cachedFacades = glob(storage_path('framework/cache/facade-*.php'));
-        foreach ($cachedFacades as $cachedFacade) {
-            unlink($cachedFacade);
-        }
-
-        // Copy stubs to storage path as if the real-time facades were cached by the framework
-        copy(
-            __DIR__ . '/stubs/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php',
-            storage_path('framework/cache/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php')
-        );
-        copy(
-            __DIR__ . '/stubs/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php',
-            storage_path('framework/cache/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php')
-        );
-
-        // new instance of the generator which we test
-        $generator = new Generator($this->app['config'], $this->app['view'], null, false);
-
-        // Clear aliases and macros to have a small output file
-        AliasLoader::getInstance()->setAliases([]);
-        Request::flushMacros();
-
-        // Generate the helper file and return the content
-        $content = $generator->generate();
-
-        $this->assertStringContainsString('namespace Facades\Illuminate\Foundation\Exceptions {', $content, 'Could not find Facades\Illuminate\Foundation\Exceptions namespace in the generated helper file.');
-        $this->assertStringContainsString('namespace Facades\App\Exceptions {', $content, 'Could not find Facades\App\Exceptions namespace in the generated helper file.');
-
-        $parsed = collect((new Php7(new Emulative()))->parse($content) ?: []);
-
-        // test the Facades\Illuminate\Foundation\Exceptions namespace in the generated helper file
-        $frameworkExceptionsNamespace = $parsed->first(function ($stmt) {
-            return ($stmt instanceof Namespace_) && $stmt->name->toString() === 'Facades\Illuminate\Foundation\Exceptions';
-        });
-        $this->assertNotNull($frameworkExceptionsNamespace, 'Could not find Facades\Illuminate\Foundation\Exceptions namespace');
-        $this->assertSame('Facades\Illuminate\Foundation\Exceptions', $frameworkExceptionsNamespace->name->toString());
-        $this->verifyNamespace($frameworkExceptionsNamespace, 'Illuminate\Foundation\Exceptions\Handler');
-
-        // test the Facades\App\Exceptions namespace in the generated helper file
-        $appExceptionsNamespace = $parsed->first(function ($stmt) {
-            return ($stmt instanceof Namespace_) && $stmt->name->toString() === 'Facades\App\Exceptions';
-        });
-        $this->assertNotNull($appExceptionsNamespace, 'Could not find Facades\App\Exceptions namespace');
-        $this->assertSame('Facades\App\Exceptions', $appExceptionsNamespace->name->toString());
-        $this->verifyNamespace($appExceptionsNamespace, 'App\Exceptions\Handler');
-    }
-
-    private function verifyNamespace(Namespace_ $namespace, $target)
-    {
-        $stmts = collect($namespace->stmts);
-
-        $this->assertInstanceOf(Class_::class, $stmts[0], 'Expected instance of Class_');
-
-        $statement = $stmts[0];
-        $this->assertArrayHasKey('comments', $statement->getAttributes());
-
-        $this->assertStringContainsString('@mixin \\' . $target, $statement->getAttributes()['comments'][0]->getText(), 'Mixin comment not found');
-        $this->assertSame(class_basename($target), $statement->name->toString(), 'Class name not found');
-        $this->assertSame($target, $statement->extends->toString(), 'Class extends not found');
-    }
-
-    protected function getPackageProviders($app)
-    {
-        return [IdeHelperServiceProvider::class];
-    }
-}

tests/stubs/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Facades\Illuminate\Foundation\Exceptions;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \Illuminate\Foundation\Exceptions\Handler
- */
-class Handler extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return 'Illuminate\Foundation\Exceptions\Handler';
-    }
-}

tests/stubs/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Facades\App\Exceptions;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \App\Exceptions\Handler
- */
-class Handler extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return 'App\Exceptions\Handler';
-    }
-}