Merge pull request #206 from SlovakNationalGallery/upgrade-laravel-an…

…d-backpack

Upgrade laravel and backpack

.github/workflows/test_and_deploy.yml

@@ -43,8 +43,10 @@ jobs:
             ${{ runner.os }}-node-
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.2
           extensions: mbstring, bcmath, fileinfo, pdo_mysql
+      - name: Add Composer auth credentials (for Backpack Pro)
+        run: echo '${{ secrets.COMPOSER_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json
       - run: composer install --no-progress --no-interaction
       - uses: actions/setup-node@v2
         with:
@@ -75,7 +77,9 @@ jobs:
           ${{ runner.os }}-composer-
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.2
+    - name: Add Composer auth credentials (for Backpack Pro)
+      run: echo '${{ secrets.COMPOSER_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json
     - run: composer install --no-progress --no-interaction --no-dev
     - uses: atymic/deployer-php-action@0.2.0
       with:

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.cache
 /node_modules
 /public/hot
 /public/storage
@@ -16,3 +17,5 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 mix-manifest.json
+auth.json
+/public/packages

README.md

@@ -12,9 +12,9 @@ installs as well as long as you configure them equivalently (see
 
 - docker
 - docker-compose
-- php 7.4
-- composer (tested with `Composer version 1.10.16 2020-10-24 09:55`)
-- node 12.13 or higher
+- php 8.2
+- composer 2
+- node 14 (or higher)
 
 ## First time setup
 
@@ -41,6 +41,12 @@ installs as well as long as you configure them equivalently (see
 
 ## Development
 
+For Backpack Pro to work, don't forget to
+
+- Create auth.json with credentials to `backpack/pro` repository. See auth.json.example
+
+Additionaly
+
 - Run `docker-compose up` to start network services
 - Run `npm run dev` to build frontend assets
 - Run `php artisan serve` to start php development server

app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

app/Http/Middleware/TrustProxies.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
-}
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
+}

app/Models/Contest.php

@@ -27,13 +27,13 @@ class Contest extends Model implements HasMedia
 
     public $incrementing = false;
 
-    protected $dates = [
-        'announced_at',
-        'approved_at',
-        'finished_at',
-        'results_published_at',
-        'created_at',
-        'updated_at',
+    protected $casts = [
+        'announced_at' => 'datetime',
+        'approved_at' => 'datetime',
+        'finished_at' => 'datetime',
+        'results_published_at' => 'datetime',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
     ];
 
     protected $appends = ['state'];

app/Models/Deadline.php

@@ -20,9 +20,14 @@ class Deadline extends Model
 
     protected $table = 'deadlines';
     protected $guarded = ['id'];
-    protected $dates = ['published_at', 'deadline_at'];
     protected $translatable = ['title'];
 
+    protected $casts = [
+        'published_at' => 'datetime',
+        'deadline_at' => 'datetime',
+    ];
+
+
     /*
     |--------------------------------------------------------------------------
     | SCOPES

app/Models/Document.php

@@ -36,7 +36,6 @@ class Document extends Model implements HasMedia
     ];
 
     protected $hidden = [];
-    // protected $dates = [];
 
     public $with = ['types', 'topics', 'roles'];
 

app/Models/Page.php

@@ -51,7 +51,10 @@ class Page extends Model implements HasMedia
         'cover_image',
         'redirect_url',
     ];
-    protected $dates = ['published_at'];
+
+    protected $casts = [
+        'published_at' => 'datetime',
+    ];
 
     public function getRouteKeyName()
     {

app/Models/Post.php

@@ -51,9 +51,10 @@ class Post extends Model implements HasMedia
         'is_featured',
         'cover_image',
     ];
-    protected $dates = ['published_at'];
+
     protected $casts = [
         'is_featured' => 'boolean',
+        'published_at' => 'datetime',
     ];
 
     public function getRouteKeyName()

app/Models/Publication.php

@@ -23,9 +23,12 @@ class Publication extends Model
 
     protected $table = 'publications';
     protected $guarded = ['id'];
-    protected $dates = ['published_at'];
     protected $translatable = ['title', 'description'];
 
+    protected $casts = [
+        'published_at' => 'datetime',
+    ];
+
     /*
     |--------------------------------------------------------------------------
     | FUNCTIONS

app/Models/Tag.php

@@ -25,7 +25,6 @@ class Tag extends Model
     protected $guarded = ['id'];
     // protected $fillable = [];
     // protected $hidden = [];
-    // protected $dates = [];
 
     protected $translatable = [
         'name',

app/Models/Tile.php

@@ -19,9 +19,12 @@ class Tile extends Model
 
     protected $table = 'tiles';
     protected $guarded = ['id'];
-    protected $dates = ['published_at'];
     protected $translatable = ['title'];
 
+    protected $casts = [
+        'published_at' => 'datetime',
+    ];
+
     /*
     |--------------------------------------------------------------------------
     | FUNCTIONS

auth.json.example

@@ -0,0 +1,11 @@
+{
+    "http-basic": {
+        "backpackforlaravel.com": {
+            "username": "...",
+            "password": "..."
+        }
+    },
+    "github-oauth": {
+        "github.com": "ghp_..."
+    }
+}

composer.json

@@ -8,47 +8,50 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.1",
         "babenkoivan/elastic-migrations": "^1.3",
         "babenkoivan/elastic-scout-driver": "^1.2",
         "babenkoivan/elastic-scout-driver-plus": "^2.3",
-        "backpack/crud": "4.1.*",
-        "backpack/filemanager": "^1.1",
-        "backpack/logmanager": "^4.0",
-        "doctrine/dbal": "^2.5",
-        "fakerphp/faker": "^1.13",
-        "fideloper/proxy": "^4.4",
-        "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.12",
-        "laravel/scout": "^8.5",
+        "backpack/crud": "^6.0.0",
+        "backpack/filemanager": "^3.0",
+        "backpack/logmanager": "^5.0",
+        "backpack/pro": "^2.1",
+        "backpack/theme-coreuiv2": "^1.2",
+        "doctrine/dbal": "^3.5",
+        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^10.10",
+        "laravel/sanctum": "^3.3",
+        "laravel/scout": "^9.0",
         "laravel/telescope": "^4.3",
-        "laravel/tinker": "^2.5",
-        "laravel/ui": "^3.1",
-        "league/flysystem-sftp": "~1.0",
-        "lorisleiva/laravel-deployer": "^0.3.5",
+        "laravel/tinker": "^2.8",
+        "league/flysystem-sftp": "^3.0",
         "mcamara/laravel-localization": "^1.6",
         "sentry/sentry-laravel": "^3.3",
-        "spatie/laravel-medialibrary": "^9.4",
+        "spatie/laravel-medialibrary": "^11.0",
         "spatie/laravel-missing-page-redirector": "^2.7",
-        "spatie/laravel-sluggable": "^2.6",
-        "spatie/laravel-tags": "^3.0",
-        "spatie/laravel-translatable": "^4.6",
+        "spatie/laravel-sluggable": "^3.5",
+        "spatie/laravel-tags": "^4.5",
+        "spatie/laravel-translatable": "^6.5",
         "spatie/pdf-to-image": "^2.1",
         "staudenmeir/eloquent-has-many-deep": "^1.13"
     },
     "require-dev": {
-        "backpack/generators": "^3.1",
-        "facade/ignition": "^2.5",
-        "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3.3"
+        "backpack/generators": "^4.0",
+        "deployer/deployer": "^7.3",
+        "fakerphp/faker": "^1.9.1",
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.18",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.1",
+        "spatie/laravel-ignition": "^2.0"
     },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
+            "pestphp/pest-plugin": true,
             "php-http/discovery": true
         }
     },
@@ -69,13 +72,10 @@
             "Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "scripts": {
-        "post-install-cmd": [
-            "@php artisan backpack:install",
-            "@php artisan elfinder:publish"
-        ],
+        "post-install-cmd": ["@php artisan elfinder:publish"],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
@@ -86,5 +86,11 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
-    }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.backpackforlaravel.com"
+        }
+    ]
 }