Merge pull request #1036 from ArlonHelps/aa/5.x-laravel-10

[5.x] Laravel 10 Support
tenancy · Jul 11, 2023 · 13146f4 · 13146f4
2 parents 95813cc + b5fdb01
commit 13146f4
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ references:
         steps:
             - checkout
             - run: apt-get -yqq update
-            - run: apt-get -yqq install git unzip zip libpq-dev default-mysql-client libpng-dev
+            - run: apt-get -yqq install git unzip zip libpq-dev default-mysql-client libpng-dev postgresql
             - run: docker-php-ext-install pdo_pgsql pdo_mysql gd
             - run: curl -sS https://getcomposer.org/installer | php
             - run: chmod +x composer.phar
@@ -19,6 +19,7 @@ references:
             - run: mysql --host=mysql -e "grant all privileges on *.* to 'testing'@'%' with grant option;"
             - run: mysql --host=mariadb2 -e "grant all privileges on *.* to 'testing'@'%' with grant option;"
             - run: mysql --host=mysql2 -e "grant all privileges on *.* to 'testing'@'%' with grant option;"
+            - run: PGPASSWORD=testing psql --host=pgsql --user=testing -c "GRANT ALL ON SCHEMA public TO testing;"
             - run: |
                 if [[ "${CIRCLE_JOB}" == *-nginx ]]; then
                     apt-get -yqq install nginx
@@ -54,14 +55,14 @@ references:
         name: mariadb2
         environment: *mysql_environment
     pgsql: &pgsql
-        image: postgres:latest
+        image: postgres:14
         name: pgsql
         environment:
             - POSTGRES_DB: testing
             - POSTGRES_USER: testing
             - POSTGRES_PASSWORD: testing
     pgsql2: &pgsql2
-        image: postgres:latest
+        image: postgres:14
         name: pgsql2
         environment:
             - POSTGRES_DB: testing
@@ -74,9 +75,20 @@ references:
         - APP_KEY: deela5kinohw0haekoothahSh8eexach
 
 jobs:
-    "php-8.0-apache":
+    "php-8.1-apache":
+        docker:
+            - image: php:8.1-apache
+              environment: *environment
+            - *mysql
+            - *mariadb
+            - *pgsql
+            - *mysql2
+            - *mariadb2
+            - *pgsql2
+        <<: *steps
+    "php-8.1-nginx":
         docker:
-            - image: php:8.0-apache
+            - image: php:8.1-fpm
               environment: *environment
             - *mysql
             - *mariadb
@@ -85,9 +97,20 @@ jobs:
             - *mariadb2
             - *pgsql2
         <<: *steps
-    "php-8.0-nginx":
+    "php-8.2-apache":
         docker:
-            - image: php:8.0-fpm
+            - image: php:8.2-apache
+              environment: *environment
+            - *mysql
+            - *mariadb
+            - *pgsql
+            - *mysql2
+            - *mariadb2
+            - *pgsql2
+        <<: *steps
+    "php-8.2-nginx":
+        docker:
+            - image: php:8.2-fpm
               environment: *environment
             - *mysql
             - *mariadb
@@ -98,7 +121,7 @@ jobs:
         <<: *steps
     coverage:
         docker:
-            - image: php:8.0-fpm
+            - image: php:8.1-fpm
               environment: *environment
             - *mariadb
             - *mariadb2
@@ -127,12 +150,20 @@ workflows:
     version: 2
     test:
         jobs:
-            - "php-8.0-apache"
-            - "php-8.0-nginx"
+            - "php-8.1-apache"
+            - "php-8.1-nginx":
+                requires:
+                    - "php-8.1-apache"
+            - "php-8.2-apache":
+                  requires:
+                      - "php-8.1-nginx"
+            - "php-8.2-nginx":
+                  requires:
+                      - "php-8.2-apache"
             - coverage:
                 filters:
                     branches:
                         only: /^([0-9]+)\.x$/
                 requires:
-                    - "php-8.0-apache"
-                    - "php-8.0-nginx"
+                    - "php-8.1-apache"
+                    - "php-8.1-nginx"
diff --git a/ci.phpunit.xml b/ci.phpunit.xml
@@ -27,8 +27,6 @@
         <env name="APP_ENV" value="testing"/>
         <env name="APP_KEY" value="Phei9thoong3ai8aqu4ieHie6kee1zee"/>
         <env name="DB_DATABASE" value="testing"/>
-        <env name="DB_PASSWORD" value="root"/>
-        <env name="DB_USERNAME" value="root"/>
         <env name="IN_CI" value="1"/>
         <env name="LIMIT_UUID_LENGTH_32" value="1"/>
         <env name="MAIL_MAILER" value="log"/>

diff --git a/composer.json b/composer.json
@@ -26,11 +26,11 @@
         "php": "^8.0",
         "doctrine/dbal": "~2.5|~3.0",
         "ramsey/uuid": "^4.0",
-        "laravel/framework": "^9.0"
+        "laravel/framework": "^10.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.12",
-        "laravel/laravel": "^9.0",
+        "laravel/laravel": "^10.0",
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^9.0",
         "symfony/dom-crawler": "~3.1"

diff --git a/src/Middleware/HostnameActions.php b/src/Middleware/HostnameActions.php
@@ -22,7 +22,6 @@
 use Hyn\Tenancy\Events\Hostnames\Secured;
 use Hyn\Tenancy\Events\Hostnames\UnderMaintenance;
 use Hyn\Tenancy\Traits\DispatchesEvents;
-use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
@@ -104,7 +103,12 @@ protected function secure(Hostname $hostname, Request $request)
     protected function maintenance(Hostname $hostname)
     {
         $this->emitEvent(new UnderMaintenance($hostname));
-        throw new MaintenanceModeException($hostname->under_maintenance_since->timestamp, null, "");
+
+        throw new \Symfony\Component\HttpKernel\Exception\HttpException(
+            503,
+            'Service Unavailable',
+            null
+        );
     }
 
     /**

diff --git a/src/Models/Hostname.php b/src/Models/Hostname.php
@@ -36,7 +36,9 @@ class Hostname extends SystemModel implements HostnameContract
 {
     use SoftDeletes;
 
-    protected $dates = ['under_maintenance_since'];
+    protected $casts = [
+        'under_maintenance_since' => 'datetime',
+    ];
 
     public function website(): BelongsTo
     {

diff --git a/tests/unit-tests/Filesystem/LoadsTranslationsTest.php b/tests/unit-tests/Filesystem/LoadsTranslationsTest.php
@@ -32,6 +32,8 @@ protected function duringSetUp(Application $app)
 
         $this->directory = $app->make(Directory::class);
         $this->directory->setWebsite($this->website);
+
+        $this->artisan('lang:publish');
     }
 
     /**

diff --git a/tests/unit-tests/Middleware/HostnameActionsTest.php b/tests/unit-tests/Middleware/HostnameActionsTest.php
@@ -21,10 +21,10 @@
 use Hyn\Tenancy\Middleware\HostnameActions;
 use Hyn\Tenancy\Tests\Test;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Carbon;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class HostnameActionsTest extends Test
@@ -43,8 +43,8 @@ public function under_maintenance()
             $this->middleware($this->hostname);
 
             $this->fail('Middleware didn\'t fire maintenance exception');
-        } catch (MaintenanceModeException $e) {
-            $this->assertEquals($e->wentDownAt->timestamp, $this->hostname->under_maintenance_since->timestamp);
+        } catch (HttpException $e) {
+            $this->assertEquals(503, $e->getStatusCode());
         }
 
         $this->hostname->under_maintenance_since = null;

diff --git a/tests/unit-tests/Queue/TenantAwareJobTest.php b/tests/unit-tests/Queue/TenantAwareJobTest.php
@@ -102,50 +102,50 @@ public function current_website_id_is_included_in_notification_job_payload()
     }
 
     /** @test */
-    public function dispatch_now_without_identified()
+    public function dispatch_sync_without_identified()
     {
         $job = new TestJob();
-        dispatch_now($job);
+        dispatch_sync($job);
 
         $this->assertNull(resolve(Environment::class)->tenant());
     }
 
     /** @test */
-    public function dispatch_now_overrides_without_identified()
+    public function dispatch_sync_overrides_without_identified()
     {
         $second = new Website;
         $this->websites->create($second);
 
         $id = $second->id;
         $job = new TestJob($id);
-        dispatch_now($job);
+        dispatch_sync($job);
 
         $this->assertEquals($id, resolve(Environment::class)->tenant()->id);
     }
 
     /** @test */
-    public function dispatch_now_identified()
+    public function dispatch_sync_identified()
     {
         $this->activateTenant();
 
         $id = resolve(Environment::class)->tenant()->id;
 
         $job = new TestJob();
-        dispatch_now($job);
+        dispatch_sync($job);
 
         $this->assertEquals($id, resolve(Environment::class)->tenant()->id);
     }
 
     /** @test */
-    public function dispatch_now_overrides_identified()
+    public function dispatch_sync_overrides_identified()
     {
         $second = new Website;
         $this->websites->create($second);
         $this->activateTenant();
 
         $id = $second->id;
         $job = new TestJob($id);
-        dispatch_now($job);
+        dispatch_sync($job);
 
         $this->assertEquals($id, resolve(Environment::class)->tenant()->id);
     }

diff --git a/tests/unit-tests/Repositories/HostnameRepositoryTest.php b/tests/unit-tests/Repositories/HostnameRepositoryTest.php
@@ -149,7 +149,7 @@ public function hostname_regex_validation()
             try {
                 $this->hostnames->create($this->hostname);
             } catch (ModelValidationException $e) {
-                $this->assertStringContainsString("The fqdn format is invalid.", $e->getMessage());
+                $this->assertStringContainsString("The fqdn field format is invalid.", $e->getMessage());
             }
         }
     }