Merge pull request #23 from bedus-creation/laravel-10.x

bedus-creation · web-flow · commit 69e47420e94f · 2023-02-16T21:59:42.000+05:45
feat(10x): laravel bump to 10x
diff --git a/.github/workflows/run-tests-L10.yml b/.github/workflows/run-tests-L10.yml
@@ -0,0 +1,45 @@
+name: "Run Tests - Current"
+
+on: [ push, pull_request ]
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [ 8.1 ]
+                laravel: [ 10.* ]
+                dependency-version: [ prefer-lowest, prefer-stable ]
+                include:
+                    - laravel: 10.*
+                      testbench: 8.*
+        
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+        
+        steps:
+            - name: Update apt
+              run: sudo apt-get update --fix-missing
+            
+            - name: Checkout code
+              uses: actions/checkout@v2
+            
+            - name: Cache dependencies
+              uses: actions/cache@v2
+              with:
+                  path: ~/.composer/cache/files
+                  key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+            
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: gd, curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+                  coverage: none
+            
+            - name: Install dependencies
+              run: |
+                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" --no-interaction --no-update
+                  composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+            - name: Execute tests
+              run: vendor/bin/phpunit
diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml
diff --git a/.github/workflows/run-tests-L9.yml b/.github/workflows/run-tests-L9.yml
diff --git a/composer.json b/composer.json
@@ -17,17 +17,17 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "php":                 "^7.4|^8.0",
-        "illuminate/http":     "^8.0|^9.0",
-        "illuminate/database": "^8.0|^9.0",
-        "illuminate/support":  "^8.0|^9.0",
-        "intervention/image":  "^2.5",
-        "ext-json":              "*",
-        "ext-gd": "*"
+        "php": "^8.1",
+        "ext-json": "*",
+        "ext-gd": "*",
+        "illuminate/http": "^10.0",
+        "illuminate/database": "^10.0",
+        "illuminate/support": "^10.0",
+        "intervention/image": "^2.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.0",
-        "orchestra/testbench": "^6.0|^9.0"
+        "phpunit/phpunit": "^9.0",
+        "orchestra/testbench": "^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -45,5 +45,6 @@
                 "Aammui\\LaravelMedia\\LaravelMediaServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
@@ -8,18 +9,19 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Permissions Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
     <php>
         <env name="CACHE_DRIVER" value="array"/>
     </php>
-</phpunit>
+</phpunit>
diff --git a/readme.md b/readme.md
@@ -19,6 +19,7 @@ composer require aammui/laravel-media
 
 | Laravel Version | Role Permission Version | Installation                                      |
 |-----------------|-------------------------|---------------------------------------------------|
+| 10.x            |                         | ```composer require aammui/laravel-media:3.0.0``` |
 | 9.x             | 2.0.0                   | ```composer require aammui/laravel-media:2.0.0``` |
 | 8.x, 7.x, 6.x   | 1.0.0                   | ```composer require aammui/laravel-media:1.0.0``` |
 
diff --git a/tests/DocumentTest.php b/tests/DocumentTest.php
@@ -21,7 +21,7 @@ public function document_can_attached_to_a_model()
 
         // Assert built url is valid
         foreach (Responsive::getConfig() as $key => $responsive) {
-            $this->assertRegExp("/http:\/\/localhost\/documents\/.*/", $model->getMedia()->first()->link($key));
+            $this->assertMatchesRegularExpression("/http:\/\/localhost\/documents\/.*/", $model->getMedia()->first()->link($key));
         }
     }
 }
diff --git a/tests/ExtensionTest.php b/tests/ExtensionTest.php
@@ -22,7 +22,7 @@ public function it_detects_if_the_given_extension_is_image($extension)
     }
 
     /**
-     * @dataProvider docuementExtensionProvider
+     * @dataProvider documentExtensionProvider
      *
      * @test
      */
@@ -34,7 +34,7 @@ public function it_detects_if_the_given_extension_is_documents($extension)
     /**
      * @return \string[][]
      */
-    public function imageExtensionProvider(): array
+    public static function imageExtensionProvider(): array
     {
         return [
             ["jpg"],
@@ -45,7 +45,7 @@ public function imageExtensionProvider(): array
     /**
      * @return \string[][]
      */
-    public function docuementExtensionProvider(): array
+    public static function documentExtensionProvider(): array
     {
         return [
             ["pdf"],
diff --git a/tests/ResponsiveImageTest.php b/tests/ResponsiveImageTest.php
@@ -43,7 +43,7 @@ public function it_generates_valid_url_for_all_the_responsive_images()
 
         // Assert built url is valid
         foreach (Responsive::getConfig() as $key => $responsive) {
-            $this->assertRegExp(
+            $this->assertMatchesRegularExpression(
                 "/http:\/\/localhost\/{$key}\/.*/", $model->getMedia()
                 ->first()
                 ->link($key)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function document_can_attached_to_a_model()`
`21`	`21`
`22`	`22`	`// Assert built url is valid`
`23`	`23`	`foreach (Responsive::getConfig() as $key => $responsive) {`
`24`		`- $this->assertRegExp("/http:\/\/localhost\/documents\/.*/", $model->getMedia()->first()->link($key));`
	`24`	`+ $this->assertMatchesRegularExpression("/http:\/\/localhost\/documents\/.*/", $model->getMedia()->first()->link($key));`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function it_detects_if_the_given_extension_is_image($extension)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * @dataProvider docuementExtensionProvider`
	`25`	`+ * @dataProvider documentExtensionProvider`
`26`	`26`	`*`
`27`	`27`	`* @test`
`28`	`28`	`*/`
`@@ -34,7 +34,7 @@ public function it_detects_if_the_given_extension_is_documents($extension)`
`34`	`34`	`/**`
`35`	`35`	`* @return \string[][]`
`36`	`36`	`*/`
`37`		`- public function imageExtensionProvider(): array`
	`37`	`+ public static function imageExtensionProvider(): array`
`38`	`38`	`{`
`39`	`39`	`return [`
`40`	`40`	`["jpg"],`
`@@ -45,7 +45,7 @@ public function imageExtensionProvider(): array`
`45`	`45`	`/**`
`46`	`46`	`* @return \string[][]`
`47`	`47`	`*/`
`48`		`- public function docuementExtensionProvider(): array`
	`48`	`+ public static function documentExtensionProvider(): array`
`49`	`49`	`{`
`50`	`50`	`return [`
`51`	`51`	`["pdf"],`