Merge pull request #2516 from briannesbitt/fix/support-classmap-autho…

…ritative Support classmap-authoritative composer option
briannesbitt · Dec 3, 2021 · 8c2a18c · 8c2a18c
2 parents 67f34dc + 846d7d1
commit 8c2a18c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -59,7 +59,11 @@ jobs:
           - php: 8.0
             laravel: true
 
-    name: ${{ matrix.laravel && 'Laravel compatibility - ' || '' }}${{ matrix.coverage && 'Coverage - ' || '' }}PHP ${{ matrix.php }} - ${{ matrix.setup || 'stable' }} - ubuntu
+          - php: 8.0
+            laravel: true
+            classmap-authoritative: true
+
+    name: ${{ matrix.laravel && 'Laravel compatibility - ' || '' }}${{ matrix.classmap-authoritative && 'classmap-authoritative - ' || '' }}${{ matrix.coverage && 'Coverage - ' || '' }}PHP ${{ matrix.php }} - ${{ matrix.setup || 'stable' }} - ubuntu
 
     steps:
       - uses: actions/checkout@v2
@@ -88,7 +92,7 @@ jobs:
             composer remove --no-update kylekatarnls/multi-tester --no-interaction;
           fi;
           ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^8.5.14 --no-interaction;' || '' }}
-          composer update --prefer-dist --no-progress --prefer-${{ matrix.setup || 'stable' }} ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }};
+          composer update --prefer-dist --no-progress --prefer-${{ matrix.setup || 'stable' }} ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }} ${{ matrix.classmap-authoritative && '--classmap-authoritative' || '' }};
 
       - name: Run test suite
         run: |

diff --git a/lazy/Carbon/TranslatorStrongType.php b/lazy/Carbon/TranslatorStrongType.php
@@ -13,8 +13,8 @@
 
 use Symfony\Component\Translation\MessageCatalogueInterface;
 
-if (!class_exists(Translator::class, false)) {
-    class Translator extends AbstractTranslator implements TranslatorStrongTypeInterface
+if (!class_exists(LazyTranslator::class, false)) {
+    class LazyTranslator extends AbstractTranslator implements TranslatorStrongTypeInterface
     {
         public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
         {

diff --git a/lazy/Carbon/TranslatorWeakType.php b/lazy/Carbon/TranslatorWeakType.php
@@ -11,8 +11,8 @@
 
 namespace Carbon;
 
-if (!class_exists(Translator::class, false)) {
-    class Translator extends AbstractTranslator
+if (!class_exists(LazyTranslator::class, false)) {
+    class LazyTranslator extends AbstractTranslator
     {
         /**
          * Returns the translation.

diff --git a/src/Carbon/Translator.php b/src/Carbon/Translator.php
@@ -25,3 +25,8 @@ class_exists(TranslatorInterface::class)
 require $transMethod->hasReturnType()
     ? __DIR__.'/../../lazy/Carbon/TranslatorStrongType.php'
     : __DIR__.'/../../lazy/Carbon/TranslatorWeakType.php';
+
+class Translator extends LazyTranslator
+{
+    // Proxy dynamically loaded LazyTranslator in a static way
+}