Merge pull request #323 from FitzwilliamMuseum/issue-322-laravel-9-mi…

…gration Migration of laravel framework
FitzwilliamMuseum · May 11, 2022 · 891e38c · 891e38c
2 parents 88eeb3c + f9ecce0
commit 891e38c
Show file tree

Hide file tree

Showing 14 changed files with 3,508 additions and 1,926 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -51,7 +51,7 @@ protected function schedule(Schedule $schedule)
         $schedule->call('App\Http\Controllers\solrimportController@mindseye')->cron('0 */5 * * *');
         $schedule->call('App\Http\Controllers\solrimportController@vacancies')->cron('0 */5 * * *');
         $schedule->call('App\Http\Controllers\solrimportController@resources')->cron('0 */5 * * *');
-        $schedule->call('App\Http\Controllers\instagramController@instagram')->cron('0 */5 * * *');
+//        $schedule->call('App\Http\Controllers\instagramController@instagram')->cron('0 */5 * * *');
         $schedule->call('App\Http\Controllers\twitterController@twitter')->cron('0 */5 * * *');
         # Import Jekyll to solr
         $schedule->call('App\Http\Controllers\jekyllController@import')->cron('0 */5 * * *');

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -14,7 +14,6 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \App\Http\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -33,8 +33,7 @@ public function boot()
         if (!$this->app->isLocal()){
           URL::forceScheme('https');
         }
-        Paginator::useBootstrap();
-        Paginator::defaultView('pagination::simple-tailwind');
+        Paginator::useBootstrapFive();
         view()->composer('includes.structure.opening-hours', \App\Http\Composers\OpeningHours::class);
         view()->composer('includes.structure.open', \App\Http\Composers\BookingLink::class);
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "laravel/laravel",
+    "name": "fitzwilliammuseum/fitz-main-website",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "A front end for the Fitzwilliam Museum website",
     "keywords": [
         "framework",
         "laravel"
@@ -12,55 +12,60 @@
             "type": "git",
             "name": "fitzwilliammuseum/maps",
             "url": "https://github.com/fitzwilliammuseum/maps.git"
+        },
+        {
+            "type": "git",
+            "name": "fitzwilliammuseum/instagram-php-scraper",
+            "url": "https://github.com/fitzwilliammuseum/instagram-php-scraper.git"
         }
     ],
     "require": {
         "php": "^8.0|^8.1",
         "ext-intl": "*",
         "ext-json": "*",
         "alaouy/youtube": "^2.2.5",
-        "buzzylab/laradown": "~0.2.1",
-        "conedevelopment/blade-filters": "^0.8.0",
-        "elasticsearch/elasticsearch": "^7.17.0",
-        "fideloper/proxy": "^4.4.1",
+        "arcanedev/laravel-markdown": "^6.0",
+        "conedevelopment/blade-filters": "^1.0",
+        "elasticsearch/elasticsearch": "^8.2.0",
         "fitzwilliammuseum/maps": "master",
-        "fruitcake/laravel-cors": "^2.2.0",
+        "fitzwilliammuseum/instagram-php-scraper": "master",
+        "fruitcake/laravel-cors": "^3.0.0",
         "gmostafa/php-graphql-client": "^1.13",
         "guzzlehttp/guzzle": "^7.4.2",
-        "imagekit/imagekit": "^1.2.2",
+        "imagekit/imagekit": "^2.0.0",
         "imliam/laravel-blade-helper": "^1.4.3",
         "jmikola/geojson": "^1.1.1",
-        "laravel/framework": "^8.83.11",
+        "laravel/framework": "^9.0",
         "laravel/tinker": "^2.7.2",
         "laravel/ui": "^3.4.5",
         "laravelcollective/html": "^6.3",
         "mews/purifier": "^3.3.7",
         "olssonm/l5-very-basic-auth": "^6.7",
         "phpclassic/php-shopify": "^v1.1.22",
-        "phpfastcache/phpfastcache": "^8.1.2",
+        "phpfastcache/phpfastcache": "^9.0",
         "predis/predis": "^1.1.10",
-        "raiym/instagram-php-scraper": "^0.11.1",
-        "rebing/graphql-laravel": "^5.1.5",
+        "psr/cache": "^3.0",
+        "rebing/graphql-laravel": "^8.2",
         "solarium/solarium": "^6.2.3",
         "spatie/laravel-feed": "^4.1.1",
         "spatie/laravel-googletagmanager": "^2.6.6",
         "spatie/laravel-missing-page-redirector": "^2.9.1",
-        "spatie/laravel-responsecache": "^6.6.9",
+        "spatie/laravel-responsecache": "^7.2.0",
         "spatie/laravel-sitemap": "^6.1.0",
-        "symfony/cache": "^5.4.8",
-        "symfony/http-kernel": "^5.4.8",
-        "thujohn/twitter": "^2.3.0",
+        "symfony/cache": "^6.0.8",
+        "symfony/http-kernel": "^6.1.x-dev",
+        "thujohn/twitter": "^3.1.15",
         "upthemedia/xss-protection": "^0.0.8",
         "xantios/mimey": "^2.2.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.12.3",
-        "facade/ignition": "^2.17.5",
         "fakerphp/faker": "^1.19.0",
         "mockery/mockery": "^1.5.0",
-        "nunomaduro/collision": "^4.3.0",
+        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.5.20",
-        "sven/artisan-view": "^3.5.0"
+        "spatie/ignition": "^1.2.10",
+        "sven/artisan-view": "^3.5"
     },
     "config": {
         "optimize-autoloader": true,