Merge pull request #15 from BellevueCollege/release-v1.13

Release v1.13
BellevueCollege · Dec 17, 2024 · e9aec88 · e9aec88
2 parents 42cab22 + 6f25d54
commit e9aec88
Show file tree

Hide file tree

Showing 26 changed files with 3,551 additions and 2,240 deletions.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -50,7 +50,7 @@ class Kernel extends HttpKernel
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
@@ -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;
 }
diff --git a/app/Http/Serializers/CustomDataArraySerializer.php b/app/Http/Serializers/CustomDataArraySerializer.php
@@ -9,7 +9,7 @@ class CustomDataArraySerializer extends \League\Fractal\Serializer\ArraySerializ
     * Custom serializer for API data.
     * Allows passing of resource label which is used to wrap data.
     **/
-    
+
     /**
      * Serialize a collection.
      *
@@ -18,14 +18,14 @@ class CustomDataArraySerializer extends \League\Fractal\Serializer\ArraySerializ
      *
      * @return array
      */
-    public function collection($resourceKey, array $data)
+    public function collection(?string $resourceKey, array $data):array
     {
         if ($resourceKey === false) {
             return $data;
         }
         return array($resourceKey ?: 'data' => $data);
     }
-    
+
     /**
      * Serialize an item.
      *
@@ -34,7 +34,7 @@ public function collection($resourceKey, array $data)
      *
      * @return array
      */
-    public function item($resourceKey, array $data)
+    public function item(?string $resourceKey, array $data):array
     {
         if ($resourceKey === false) {
             return $data;
@@ -47,9 +47,8 @@ public function item($resourceKey, array $data)
      *
      * @return array
      */
-    public function null()
+    public function null():?array
     {
         return null;
     }
 }
-?>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,10 +11,10 @@ pr:
      - release-*
 
 pool:
-  vmImage: ubuntu-latest
+  vmImage: ubuntu-24.04
 
 variables:
-  phpVersion: 7.3
+  phpVersion: 8.3
 
 steps:
 - script: |
@@ -32,4 +32,4 @@ steps:
   inputs:
     targetPath: '$(Pipeline.Workspace)'
     artifact: 'data-api'
-    publishLocation: 'pipeline'
+    publishLocation: 'pipeline'
diff --git a/composer.json b/composer.json
@@ -5,25 +5,24 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.3.14",
-        "adldap2/adldap2-laravel": "^6.1",
+        "php": "^8.3.6",
         "darkaonline/l5-swagger": "^8.1",
-        "fideloper/proxy": "^4.2",
-        "laravel/framework": "^8.0",
+        "directorytree/ldaprecord-laravel": "*",
+        "laravel/framework": "^11.0",
         "laravel/helpers": "^1.1",
         "laravel/legacy-factories": "^1.1",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.0",
-        "league/fractal": "^0.19",
-        "tymon/jwt-auth": "^1.0"
+        "laravel/ui": "^4.2.2",
+        "league/fractal": "^0.20.1",
+        "tymon/jwt-auth": "^2.0.0"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
         "filp/whoops": "^2.0",
-        "laravel/sail": "^1.19",
+        "laravel/sail": "^1.39",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^5.1",
-        "phpunit/phpunit": "^9.0"
+        "nunomaduro/collision": "^8.1",
+        "phpunit/phpunit": "^11.5"
     },
     "autoload": {
         "autoload": {
@@ -65,12 +64,11 @@
         "sort-packages": true,
         "optimize-autoloader": true,
         "platform": {
-            "php": "7.3.14"
+            "php": "8.3.6"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
-    "minimum-stability": "dev",
     "prefer-stable": true
 }