Merge pull request #328 from TheDragonCode/patch/2024-03-31/18-16

Added support for Laravel 11 and fixed initialization issue
TheDragonCode · Mar 31, 2024 · ecd8056 · ecd8056
2 parents b6e1b9a + 9c25389
commit ecd8056
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -18,7 +18,7 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
+                    coverage: xdebug
                 env:
                     COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
 

diff --git a/composer.json b/composer.json
@@ -35,12 +35,12 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "laravel-lang/publisher": "^14.6"
+        "laravel-lang/publisher": "^14.6 || ^15.0 || ^16.0"
     },
     "require-dev": {
-        "laravel-lang/status-generator": "^1.18",
-        "phpunit/phpunit": "^9.6",
-        "symfony/var-dumper": "^6.2"
+        "laravel-lang/status-generator": "^1.18 || ^2.0",
+        "phpunit/phpunit": "^10.0",
+        "symfony/var-dumper": "^6.2 || ^7.0"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
@@ -67,7 +67,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "YourNamespace\\Translations\\ServiceProvider"
+                "DragonCode\\TranslationSet\\ServiceProvider"
             ]
         }
     }

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,36 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          cacheResult="false"
-         backupGlobals="false"
-         backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
+         cacheDirectory=".phpunit.cache"
 >
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
+    <coverage>
         <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/logs/coverage"/>
-            <text outputFile="build/logs/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml" />
+            <html outputDirectory="build/logs/coverage" />
+            <text outputFile="build/logs/coverage.txt" />
         </report>
     </coverage>
     <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF" />
     </php>
     <testsuites>
         <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
 </phpunit>