Merge branch 'v1'

# Conflicts: # .github/workflows/run-tests.yml # composer.json
wotzebra · Mar 15, 2024 · 15d1fbb · 15d1fbb
2 parents 6b16dfd + 21f1253
commit 15d1fbb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,8 +11,11 @@ jobs:
             fail-fast: false
             matrix:
                 php: [8.1, 8.2, 8.3]
-                laravel: [10.*]
+                laravel: [10.*, 11.*]
                 dependency-version: [prefer-lowest, prefer-stable]
+                exclude:
+                    -   php: 8.1
+                        laravel: 11.*
 
         name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-poeditor-sync` will be documented in this file
 
+## 1.0.1 - 2024-03-15
+
+- Added: Laravel 11 support ([#27](https://github.com/nextapps-be/laravel-poeditor-sync/pull/27))
+
 ## 1.0.0 - 2024-01-23
 
 - Changed: Modernize codebase ([#16](https://github.com/nextapps-be/laravel-poeditor-sync/pull/16))

diff --git a/composer.json b/composer.json
@@ -19,16 +19,16 @@
     "require": {
         "php": "^8.1|^8.2|^8.3",
         "guzzlehttp/guzzle": "^7.0",
-        "illuminate/filesystem": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/support": "^10.10",
+        "illuminate/filesystem": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/support": "^10.10|^11.0",
         "symfony/var-exporter": "^6.0"
     },
     "require-dev": {
         "adamwojs/php-cs-fixer-phpdoc-force-fqcn": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.1",
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^9.1|^10.0",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

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