Laravel 10 support.

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "laravel/framework:9.*" "doctrine/dbal:^3.0" --no-interaction --no-update
-          composer update --prefer-stable --prefer-dist --no-interaction
+          composer install
 
       - name: Execute tests
         run: vendor/bin/phpstan
@@ -66,12 +66,22 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.1, 8.0]
-        laravel: [9.*]
+        laravel: [9.*, 10.*]
+        exclude:
+          - laravel: 10.*
+            php: 8.0
         include:
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
 
     steps:
+      - name: Set timezone?
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: "Europe/Paris"
+
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -102,8 +112,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:^3.0" --no-interaction --no-update -vvv
-          composer install --prefer-dist --no-interaction --no-plugins -vvv
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:^3.0" --no-interaction --no-update
+          composer install --prefer-dist --no-interaction --no-plugins
 
       - name: Setup Node.js
         uses: actions/setup-node@v1

composer.json

@@ -26,12 +26,12 @@
     "php": "^8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "astrotomic/laravel-translatable": "^11.5",
-    "cartalyst/tags": "^12.0",
+    "astrotomic/laravel-translatable": "^v11.12",
+    "cartalyst/tags": "^12.0|^13.0",
     "doctrine/dbal": "^3.0",
     "guzzlehttp/guzzle": "^7.0",
     "imgix/imgix-php": "^3.0",
-    "laravel/framework": "^9.0",
+    "laravel/framework": "^9.0|^10.0",
     "laravel/socialite": "^5.3",
     "laravel/ui": "^4.0",
     "league/flysystem-aws-s3-v3": "^3.0",
@@ -50,8 +50,8 @@
     "nette/php-generator": "v4.0.3",
     "nunomaduro/collision": "^6.0",
     "nunomaduro/larastan": "^2.0",
-    "orchestra/testbench": "^7.8",
-    "orchestra/testbench-dusk": "^7.8",
+    "orchestra/testbench": "^7.8|^8.0",
+    "orchestra/testbench-dusk": "^7.8|^8.0",
     "phpunit/phpunit": "~9.0",
     "rector/rector": "^0.12.15",
     "spatie/invade": "^1.1",

docs/content/1_documentation/3_modules/4_models.md

@@ -106,8 +106,8 @@ to allow content scheduling.
 In addition to them being fillable you also need to add the following casts:
 
 ```php
-public $dates = [
-    'publish_start_date',
-    'publish_end_date'
+public $casts = [
+    'publish_start_date' => 'datetime',
+    'publish_end_date' => 'datetime'
 ];
 ```

frontend/js/components/DatePicker.vue

@@ -1,9 +1,12 @@
 <template>
-  <a17-inputframe :name="name" :error="error" :note="note" :label="label" :label-for="uniqId" class="datePicker" :class="{ 'datePicker--static' : staticMode, 'datePicker--mobile' : isMobile }" :required="required">
+  <a17-inputframe :name="name" :error="error" :note="note" :label="label" :label-for="uniqId" class="datePicker"
+                  :class="{ 'datePicker--static' : staticMode, 'datePicker--mobile' : isMobile }" :required="required">
     <div class="datePicker__group" :ref="refs.flatPicker">
       <div class="form__field datePicker__field">
-        <input type="text" :name="name" :id="uniqId" :required="required" :placeholder="placeHolder" data-input @blur="onBlur" v-model="date" :disabled="disabled">
-        <a href="#" v-if="clear" class="datePicker__reset" :class="{ 'datePicker__reset--cleared' : !date }" @click.prevent="onClear"><span v-svg symbol="close_icon"></span></a>
+        <input type="text" :name="name" :id="uniqId" :required="required" :placeholder="placeHolder" data-input
+               @blur="onBlur" v-model="date" :disabled="disabled">
+        <a href="#" v-if="clear" class="datePicker__reset" :class="{ 'datePicker__reset--cleared' : !date }"
+           @click.prevent="onClear"><span v-svg symbol="close_icon"></span></a>
       </div>
     </div>
   </a17-inputframe>
@@ -18,7 +21,7 @@
   import FormStoreMixin from '@/mixins/formStore'
   import InputframeMixin from '@/mixins/inputFrame'
   import randKeyMixin from '@/mixins/randKey'
-  import { getCurrentLocale, isCurrentLocale24HrFormatted,locales } from '@/utils/locale'
+  import { getCurrentLocale, isCurrentLocale24HrFormatted, locales } from '@/utils/locale'
 
   export default {
     name: 'A17DatePicker',
@@ -164,18 +167,16 @@
             setTimeout(function () {
               self.flatPicker.set('maxDate', self.maxDate) // in case maxDate changed since last open
               self.flatPicker.set('minDate', self.minDate) // in case minDate changed since last open
+              self.$emit('open', self.date)
             }, 10)
 
-            self.$emit('open', self.date)
           },
           onClose: function (selectedDates, dateStr, instance) {
-            self.$nextTick(function () { // wait for the datepicker to properly update the UI
-              self.$emit('input', self.date)
-              self.$emit('close', self.date)
+            self.$emit('input', dateStr)
+            self.$emit('close', dateStr)
 
-              // see formStore mixin
-              self.saveIntoStore()
-            })
+            // see formStore mixin
+            self.saveIntoStore()
           }
         }
 
@@ -230,19 +231,19 @@
   }
 
   .datePicker__reset {
-    $button-reset__width:45px - 13px - 14px;
-    display:block;
+    $button-reset__width: 45px - 13px - 14px;
+    display: block;
     width: $button-reset__width;
     flex: 0 0 $button-reset__width;
     height: $button-reset__width;
-    overflow:hidden;
+    overflow: hidden;
     color: $color__background;
-    background:$color__icons;
-    border-radius:#{calc($button-reset__width / 2)};
-    margin-top:13px;
-    margin-right:13px;
-    line-height:$button-reset__width;
-    text-align:center;
+    background: $color__icons;
+    border-radius: #{calc($button-reset__width / 2)};
+    margin-top: 13px;
+    margin-right: 13px;
+    line-height: $button-reset__width;
+    text-align: center;
     transition: opacity 0.2s ease;
 
     .icon {
@@ -254,32 +255,33 @@
 
     &:hover,
     &:focus {
-      background:$color__fborder--active;
+      background: $color__fborder--active;
     }
   }
 
   .datePicker__reset.datePicker__reset--cleared {
-    opacity:0;
-    pointer-events:none;
+    opacity: 0;
+    pointer-events: none;
   }
 
   /* Static variant (but not in the mobile version) */
   .datePicker--static:not(.datePicker--mobile) {
     .form__field {
-      height:0;
-      position:static;
-      overflow:visible;
-      border:0 none;
+      height: 0;
+      position: static;
+      overflow: visible;
+      border: 0 none;
     }
+
     .datePicker__reset {
-      position:absolute;
-      right:0;
-      top:0;
+      position: absolute;
+      right: 0;
+      top: 0;
     }
   }
 
   .flatpickr-wrapper {
-    display:block;
+    display: block;
   }
 </style>
 

frontend/js/components/PubAccordion.vue

@@ -18,7 +18,7 @@
         :initialValue="startDate"
         :maxDate="endDate"
         :enableTime="true"
-        :allowInput="true"
+        :allowInput="false"
         :staticMode="true"
         @open="openStartCalendar"
         @close="closeCalendar"
@@ -32,7 +32,7 @@
         :initialValue="endDate"
         :minDate="startDate"
         :enableTime="true"
-        :allowInput="true"
+        :allowInput="false"
         :staticMode="true"
         @open="openEndCalendar"
         @close="closeCalendar"

src/Models/Group.php

@@ -26,14 +26,11 @@ class Group extends BaseModel implements TwillModelContract
         'subdomains_access',
     ];
 
-    protected $dates = [
-        'deleted_at',
-    ];
-
     public $checkboxes = ['published'];
 
     protected $casts = [
         'subdomains_access' => 'array',
+        'deleted_at' => 'datetime'
     ];
 
     /**

src/Models/Role.php

@@ -31,14 +31,11 @@ class Role extends BaseModel implements Sortable, TwillModelContract
         'position',
     ];
 
-    protected $dates = [
-        'deleted_at',
-    ];
-
     public $checkboxes = ['published'];
 
     protected $casts = [
         'in_everyone_group' => 'boolean',
+        'deleted_at' => 'datetime'
     ];
 
     public function scopeAccessible($query): Builder

src/Models/User.php

@@ -40,6 +40,9 @@ class User extends AuthenticatableContract implements TwillModelContract
     protected $casts = [
         'is_superadmin' => 'boolean',
         'published' => 'boolean',
+        'deleted_at' => 'datetime',
+        'registered_at' => 'datetime',
+        'last_login_at' => 'datetime',
     ];
 
     protected $fillable = [
@@ -55,12 +58,6 @@ class User extends AuthenticatableContract implements TwillModelContract
         'language',
     ];
 
-    protected $dates = [
-        'deleted_at',
-        'registered_at',
-        'last_login_at',
-    ];
-
     protected $hidden = ['password', 'remember_token', 'google_2fa_secret'];
 
     public $checkboxes = ['published'];

src/Repositories/Behaviors/HandleDates.php

@@ -14,12 +14,12 @@ public function prepareFieldsBeforeCreateHandleDates(array $fields): array
 
     public function prepareFieldsBeforeSaveHandleDates(?TwillModelContract $object, array $fields): array
     {
-        foreach ($this->model->getDates() as $f) {
-            if (isset($fields[$f])) {
-                if (!empty($fields[$f])) {
-                    $fields = $this->prepareDatesField($fields, $f);
+        foreach ($fields as $name => $fieldData) {
+            if ($this->model->hasCast($name, ['date', 'datetime'])) {
+                if (!empty($fields[$name])) {
+                    $fields = $this->prepareDatesField($fields, $name);
                 } else {
-                    $fields[$f] = null;
+                    $fields[$name] = null;
                 }
             }
         }

tests/Browser/BrowserTestCase.php

@@ -88,7 +88,7 @@ public static function delTree($dir): bool
     public static function setUpBeforeClass(): void
     {
         cleanupTestState(self::applicationBasePath());
-        parent::setUpBeforeClass(); // TODO: Change the autogenerated stub
+        parent::setUpBeforeClass();
     }
 
     public function tearDown(): void

tests/integration/Anonymous/AnonymousModule.php

@@ -596,6 +596,10 @@ private function getModelClass(string $classNameWithNamespace): PhpNamespace
             $casts[$field] = 'array';
         }
 
+        foreach (collect($this->fields)->where('type', 'dateTime')->keys() as $field) {
+            $casts[$field] = 'datetime';
+        }
+
         $fillable = array_keys($this->fields);
 
         foreach (array_keys($this->belongsTo) as $base) {
@@ -607,13 +611,6 @@ private function getModelClass(string $classNameWithNamespace): PhpNamespace
         $class->addProperty('table', $this->namePlural);
         $class->addProperty('translationForeignKey', Str::singular($this->namePlural) . '_id');
         $class->addProperty('translationModel', $this->modelTranslationClass);
-        $class->addProperty(
-            'dates',
-            collect($this->fields)
-                ->where('type', 'dateTime')
-                ->keys()
-                ->all()
-        );
 
         $class->addProperty(
             'translatedAttributes',

tests/integration/PasswordsTest.php

@@ -77,7 +77,7 @@ public function testCanResetPassword()
             'token' => Notification::token(),
         ]);
 
-        $this->assertSee('Your password has been reset!');
+        $this->assertSee('You don't have any activity yet.');
     }
 
     public function testCanExpireResetPasswordToken()