Merge pull request #25 from patinthehat/v2

Add PHP 8-only support (v2)
spatie · Mar 26, 2021 · 9de2c86 · 9de2c86
2 parents 4942bd8 + a116363
commit 9de2c86
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
-                php: [8.0, 7.4, 7.3, 7.2]
+                php: [8.0]
                 dependency-version: [prefer-lowest, prefer-stable]
                 os: [ubuntu-latest, windows-latest]
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to `macroable` will be documented in this file
 
+## 2.0.0 - unreleased
+
+- require PHP 8+
+- drop support for PHP 7.x
+- convert syntax to PHP 8
+
 ## 1.0.1 - 2020-11-03
 
 - add support for PHP 8.0

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0"
+        "php": "^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0|^9.3"

diff --git a/src/Macroable.php b/src/Macroable.php
@@ -9,25 +9,14 @@
 
 trait Macroable
 {
-    protected static $macros = [];
-
-    /**
-     * Register a custom macro.
-     *
-     * @param  string $name
-     * @param  object|callable  $macro
-     */
-    public static function macro(string $name, $macro)
+    protected static array $macros = [];
+
+    public static function macro(string $name, object | callable $macro): void
     {
         static::$macros[$name] = $macro;
     }
 
-    /**
-     * Mix another object into the class.
-     *
-     * @param  object  $mixin
-     */
-    public static function mixin($mixin)
+    public static function mixin(object | string $mixin): void
     {
         $methods = (new ReflectionClass($mixin))->getMethods(
             ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED