Merge pull request #25 from Icinga/fix-autoloading

Fix autoloading

.github/workflows/clean-vendor.yml

@@ -1,26 +0,0 @@
-name: Clean Vendor Check
-
-on:
-  push:
-    branches:
-      - stable/*
-
-jobs:
-  check-vendor:
-    name: Clean Vendor Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code base
-        uses: actions/checkout@v3
-
-      - name: Check If Vendor Is Clean
-        run: |
-          files=`find vendor -maxdepth 1 -type d -not -name "ipl" -not -name "fortawesome" -not -name "composer" -not -name "vendor"`
-          if [ -z "$files" ]; then
-            echo "No unknown vendor files found";
-            exit 0;
-          else
-            echo "Found unknown vendor files: $files";
-            exit 1;
-          fi

bin/make-release.sh

@@ -53,12 +53,6 @@ rm -rf vendor
 git checkout vendor
 composer validate --no-check-all --strict || fail "Composer validate failed"
 
-UNKNOWN_VENDOR_FILES=$(find vendor -maxdepth 1 -type d -not -name "ipl" -not -name "fortawesome" -not -name "composer" -not -name "vendor")
-if [ -n "$UNKNOWN_VENDOR_FILES" ]; then
-  echo "Unknown vendor files found! DO NOT TAG!"
-  exit 1
-fi
-
 if [ -z "$NO_OPT" ]; then
   git tag -a v$VERSION -m "Version v$VERSION"
   echo "Finished, tagged v$VERSION"

composer.json

@@ -8,17 +8,13 @@
         "sort-packages": true,
         "platform": {
             "php": "7.2.9"
+        },
+        "allow-plugins": {
+            "cweagans/composer-patches": true
         }
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "./replacer"
-        }
-    ],
     "require": {
         "php": ">=7.2",
-        "repl/acer": "@dev",
         "ipl/html": "^0.8.0",
         "ipl/i18n": "^0.2.0",
         "ipl/orm": "^0.6.0",
@@ -26,7 +22,10 @@
         "ipl/sql": "^0.7.0",
         "ipl/stdlib": "^0.13.0",
         "ipl/validator": "^0.5.0",
-        "ipl/web": "^0.9.0"
+        "ipl/web": "^0.9.0",
+        "cweagans/composer-patches": "~1.0"
+    },
+    "require-dev": {
     },
     "autoload": {
         "psr-0": { "AssetLoader": "" }
@@ -35,5 +34,13 @@
         "post-update-cmd": [
             "AssetLoader::update"
         ]
+    },
+    "extra": {
+        "composer-exit-on-patch-failure": true,
+        "patches": {
+            "ramsey/collection": {
+                "Collection: Add PHP 8.1 support": "patches/ramsey-collection.patch"
+            }
+        }
     }
 }

patches/ramsey-collection.patch

@@ -0,0 +1,37 @@
+--- a/vendor/ramsey/collection/src/AbstractArray.php
++++ b/vendor/ramsey/collection/src/AbstractArray.php
+@@ -84,6 +84,7 @@ abstract class AbstractArray implements ArrayInterface
+      * @return T|null the value stored at the offset, or null if the offset
+      *     does not exist.
+      */
++    #[\ReturnTypeWillChange]
+     public function offsetGet($offset)
+     {
+         return $this->data[$offset] ?? null;
+@@ -132,6 +133,11 @@ abstract class AbstractArray implements ArrayInterface
+         return serialize($this->data);
+     }
+
++    public function __serialize()
++    {
++        return $this->serialize();
++    }
++
+     /**
+      * Converts a serialized string representation into an instance object.
+      *
+@@ -149,6 +155,11 @@ abstract class AbstractArray implements ArrayInterface
+         $this->data = $data;
+     }
+
++    public function __unserialize(array $data)
++    {
++        $this->unserialize($data);
++    }
++
+     /**
+      * Returns the number of items in this array.
+      *
+--
+2.41.0
+

replacer/composer.json

@@ -1,18 +0,0 @@
-{
-  "name": "repl/acer",
-  "type": "metapackage",
-  "description": "Replaces third party packages as they are included in icinga-php-thirdparty",
-  "license": "MIT",
-  "replace": {
-    "psr/http-message": "*",
-    "guzzlehttp/psr7": "*",
-    "dragonmantank/cron-expression": "*",
-    "psr/log": "*",
-    "ramsey/uuid": "*",
-    "react/event-loop": "*",
-    "react/promise": "*",
-    "simshaun/recurr": "*",
-    "evenement/evenement": "*",
-    "wikimedia/less.php": "*"
-  }
-}