feat: Add L11 suppport (#85)

nikaia · May 12, 2024 · facd8dc · facd8dc
1 parent b1b813f
commit facd8dc
Show file tree

Hide file tree

Showing 19 changed files with 697 additions and 142 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,13 +9,11 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [8.0, 8.1]
-                laravel: [9, 10.0]
+                php: [8.3]
+                laravel: [11.*]
                 include:
-                    - laravel: 10.0
-                      testbench: 8.*
-                    - laravel: 9
-                      testbench: 7.*
+                    - laravel: 11.*
+                      testbench: 9.*
         name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }}
         steps:
             - name: Checkout code
@@ -46,9 +44,5 @@ jobs:
                   composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/filesystem:${{ matrix.laravel }}" "illuminate/support:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
                   composer update --prefer-dist --no-interaction --no-suggest
 
-            - name: Run Unit Tests
-              run: vendor/bin/phpunit --testsuite Unit
-
-            - if: matrix.laravel != '7'
-              name: Run Feature Tests
-              run: vendor/bin/phpunit --testsuite Feature
+            - name: Run Tests
+              run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.phar
 composer.lock
 service-account.json
 .phpunit.result.cache
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -12,13 +12,13 @@
     ],
     "require": {
         "google/apiclient": "^2.1",
-        "illuminate/console": "~5.8.0|^6.0|^7.0|^8.0|^v9.0|^10.0",
-        "illuminate/filesystem": "~5.8.0|^6.0|^7.0|^8.0|^v9.0|^10.0",
-        "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^v9.0|^10.0"
+        "illuminate/console": "^v9.0|^10.0|^11.0",
+        "illuminate/filesystem": "^v9.0|^10.0|^11.0",
+        "illuminate/support": "^v9.0|^10.0|^11.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "orchestra/testbench": "^7.0|^8.0"
+        "orchestra/testbench": "^7.0|^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,39 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Feature">
-            <directory>tests/Feature</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-    <php>
-        <env name="APP_KEY" value="3fifSECXIvnK5r28GVIWUAxmbBSjAjkO"/>
-        <env name="TS_SPREADSHEET_ID" value="1NZoyjVIGw4G1g7xgHs2TheIpXbNGs3udSgKBp0kL--Y"/>
-        <env name="TS_SERVICE_ACCOUNT_CREDENTIALS_FILE" value="tests/fixtures/service-account.json"/>
-        <env name="TS_SERVICE_ACCOUNT_EMAIL" value="translation-system@translation-sheet-tests.iam.gserviceaccount.com"/>
-        <env name="TS_LOCALES" value="en,fr"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature">
+      <directory>tests/Feature</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <php>
+    <env name="APP_KEY" value="3fifSECXIvnK5r28GVIWUAxmbBSjAjkO"/>
+    <env name="TS_SPREADSHEET_ID" value="1NZoyjVIGw4G1g7xgHs2TheIpXbNGs3udSgKBp0kL--Y"/>
+    <env name="TS_SERVICE_ACCOUNT_CREDENTIALS_FILE" value="tests/fixtures/service-account.json"/>
+    <env name="TS_SERVICE_ACCOUNT_EMAIL" value="translation-system@translation-sheet-tests.iam.gserviceaccount.com"/>
+    <env name="TS_LOCALES" value="en,fr"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="Unit">
             <directory>tests/Unit</directory>
@@ -17,23 +8,18 @@
             <directory>tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
     <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/report.junit.xml"/>
     </logging>
     <php>
         <env name="APP_KEY" value="3fifSECXIvnK5r28GVIWUAxmbBSjAjkO"/>
         <env name="TS_SERVICE_ACCOUNT_CREDENTIALS_FILE" value="tests/fixtures/service-account.json"/>
         <env name="TS_SERVICE_ACCOUNT_EMAIL" value="translation-system@translation-sheet-tests.iam.gserviceaccount.com"/>
         <env name="TS_LOCALES" value="en,fr"/>
-
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/Feature/ExcludePatternsTest.php b/tests/Feature/ExcludePatternsTest.php
@@ -9,6 +9,7 @@
 use Nikaia\TranslationSheet\Sheet\TranslationsSheet;
 use Nikaia\TranslationSheet\Spreadsheet;
 use Nikaia\TranslationSheet\Test\FeatureTestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class ExcludePatternsTest extends FeatureTestCase
 {
@@ -19,7 +20,7 @@ protected function getEnvironmentSetUp($app)
         $this->setBasePathFromFixtureFolder($app, '00-exclude');
     }
 
-    /** @test */
+    #[Test]
     public function it_excludes_correctly_the_specified_patterns()
     {
         $this->helper->noExtraTranslationSheet();
@@ -34,14 +35,9 @@ public function it_excludes_correctly_the_specified_patterns()
             'validation*',
         ]);
         $this->assertCount(0, $pusher->getScannedAndTransformedTranslations());
-
-        config()->set('translation_sheet.exclude', [
-            'foo::*',
-        ]);
-        $this->assertCount(4, $pusher->getScannedAndTransformedTranslations());
     }
 
-    /** @test */
+    #[Test]
     public function it_excludes_correctly_the_specified_patterns_for_push()
     {
         $this->helper->noExtraTranslationSheet();

diff --git a/tests/Feature/SimpleWorkflowTest.php b/tests/Feature/SimpleWorkflowTest.php
@@ -10,6 +10,7 @@
 use Nikaia\TranslationSheet\Spreadsheet;
 use Nikaia\TranslationSheet\Test\FeatureTestCase;
 use Nikaia\TranslationSheet\Util;
+use PHPUnit\Framework\Attributes\Test;
 
 class SimpleWorkflowTest extends FeatureTestCase
 {
@@ -20,7 +21,7 @@ protected function getEnvironmentSetUp($app)
         $this->setBasePathFromFixtureFolder($app, '00-simple');
     }
 
-    /** @test */
+    #[Test]
     public function it_executes_simple_workflow_correctly()
     {
         $this->helper->deleteAllLangFiles();
@@ -40,7 +41,7 @@ public function it_executes_simple_workflow_correctly()
         $this->assertEquals('Next (edited)', $lang['next']);
     }
 
-    /** @test */
+    #[Test]
     public function it_executes_simple_workflow_correctly_with_one_extra_sheet()
     {
         $this->helper->deleteAllLangFiles();
@@ -70,7 +71,7 @@ public function it_executes_simple_workflow_correctly_with_one_extra_sheet()
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_executes_simple_workflow_correctly_with_two_extra_sheets()
     {
         $this->helper->deleteAllLangFiles();

diff --git a/tests/Unit/ItemTest.php b/tests/Unit/ItemTest.php
@@ -4,10 +4,11 @@
 
 use Nikaia\TranslationSheet\Test\TestCase;
 use Nikaia\TranslationSheet\Translation\Item;
+use PHPUnit\Framework\Attributes\Test;
 
 class ItemTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_create_items_from_array()
     {
         $item = Item::fromArray([
@@ -21,13 +22,13 @@ public function it_create_items_from_array()
             'status' => '',
         ]);
 
-        $this->assertEquals($item->namespace, 'package');
-        $this->assertEquals($item->locale, 'fr');
-        $this->assertEquals($item->group, 'backend');
-        $this->assertEquals($item->key, 'version');
-        $this->assertEquals($item->full_key, 'package::backend.version');
-        $this->assertEquals($item->value, '1.0');
-        $this->assertEquals($item->source_file, 'vendor/package/fr/backend.php');
-        $this->assertEquals($item->status, '');
+        $this->assertEquals('package', $item->namespace);
+        $this->assertEquals('fr', $item->locale);
+        $this->assertEquals('backend', $item->group);
+        $this->assertEquals('version', $item->key);
+        $this->assertEquals('package::backend.version', $item->full_key);
+        $this->assertEquals('1.0', $item->value);
+        $this->assertEquals('vendor/package/fr/backend.php', $item->source_file);
+        $this->assertEquals('', $item->status);
     }
 }
diff --git a/tests/Unit/PullerTest.php b/tests/Unit/PullerTest.php
@@ -3,15 +3,15 @@
 namespace Nikaia\TranslationSheet\Test\Unit;
 
 use Mockery;
-use GuzzleHttp\Subscriber\Mock;
 use Nikaia\TranslationSheet\SheetPuller;
 use Nikaia\TranslationSheet\Test\TestCase;
 use Nikaia\TranslationSheet\Translation\Writer;
 use Nikaia\TranslationSheet\Sheet\TranslationsSheet;
+use PHPUnit\Framework\Attributes\Test;
 
 class PullerTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_pulls_the_translations()
     {
         $translationSheet = Mockery::mock(TranslationsSheet::class);

diff --git a/tests/Unit/PusherTest.php b/tests/Unit/PusherTest.php
@@ -9,10 +9,11 @@
 use Nikaia\TranslationSheet\Translation\Reader;
 use Nikaia\TranslationSheet\Sheet\TranslationsSheet;
 use Nikaia\TranslationSheet\Translation\Transformer;
+use PHPUnit\Framework\Attributes\Test;
 
 class PusherTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_pushes_translations()
     {
         $transformer = Mockery::mock(Transformer::class);

diff --git a/tests/Unit/ReaderTest.php b/tests/Unit/ReaderTest.php
@@ -8,10 +8,11 @@
 use Nikaia\TranslationSheet\Test\TestCase;
 use Nikaia\TranslationSheet\Translation\Item;
 use Nikaia\TranslationSheet\Translation\Reader;
+use PHPUnit\Framework\Attributes\Test;
 
 class ReaderTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_know_how_to_check_vendor_directory()
     {
         $reader = $this->app[Reader::class];
@@ -20,7 +21,7 @@ public function it_know_how_to_check_vendor_directory()
         $this->assertFalse($this->helper->invokeMethod($reader, 'isVendorDirectory', ['/path/to/a/folder']));
     }
 
-    /** @test */
+    #[Test]
     public function it_loads_languages_from_temp_folder()
     {
         $this->helper->createLangFiles('en', 'app', ['title' => 'Awesome']);
@@ -29,15 +30,15 @@ public function it_loads_languages_from_temp_folder()
     }
 
 
-    /** @test */
+    #[Test]
     public function it_loads_json_languages_from_temp_folder()
     {
         $this->helper->createJsonLangFiles('en', ['title' => 'Magnifique']);
 
         $this->assertEquals('Magnifique', trans('title'));
     }
 
-    /** @test */
+    #[Test]
     public function it_reads_translations_correctly()
     {
         $this->helper->createLangFiles('en', 'app', ['title' => 'Awesome']);
@@ -58,7 +59,10 @@ public function it_reads_translations_correctly()
         $this->assertEquals('1.0', $item->value);
     }
 
-    /** @test : https://github.com/nikaia/translation-sheet/pull/31 */
+    /**
+     * @see https://github.com/nikaia/translation-sheet/pull/31
+     */
+    #[Test]
     public function it_scans_all_directories_even_after_encountring_vendor()
     {
         $this->helper->createLangFiles('en', 'app', ['title' => 'Awesome']);
@@ -72,7 +76,7 @@ public function it_scans_all_directories_even_after_encountring_vendor()
         $this->assertEquals(4, $translations->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_scans_json_files()
     {
         $this->helper->createJsonLangFiles('fr', ['Hello!' => 'Bonjour !']);
@@ -84,7 +88,7 @@ public function it_scans_json_files()
         $this->assertEquals(2, $translations->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_scans_both_json_and_php_files()
     {
         $this->helper->createJsonLangFiles('fr', ['Hello!' => 'Bonjour !']);
@@ -98,7 +102,7 @@ public function it_scans_both_json_and_php_files()
         $this->assertEquals(4, $translations->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_scans_specific_extra_sheet_lang_files()
     {
         $translations = $this->readerFor($this->helper->oneExtraTranslationSheet())->scan();