Enhancement: Add support for PHP 7.3

.github/workflows/integrate.yaml

@@ -417,6 +417,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

CHANGELOG.md

@@ -12,6 +12,7 @@ For a full diff see [`1.6.0...main`][1.6.0...main].
 
 - Added support for PHP 8.0 ([#926]), by [@localheinz]
 - Added support for PHP 7.4 ([#929]), by [@localheinz]
+- Added support for PHP 7.3 ([#930]), by [@localheinz]
 
 ## [`1.6.0`][1.6.0]
 
@@ -187,6 +188,7 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
 [#795]: https://github.com/ergebnis/classy/pull/795
 [#926]: https://github.com/ergebnis/classy/pull/926
 [#929]: https://github.com/ergebnis/classy/pull/929
+[#930]: https://github.com/ergebnis/classy/pull/930
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz

test/DataProvider/Php73.php

@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2017-2024 Andreas Möller
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE.md file that was distributed with this source code.
+ *
+ * @see https://github.com/ergebnis/classy
+ */
+
+namespace Ergebnis\Classy\Test\DataProvider;
+
+use Ergebnis\Classy\Construct;
+use Ergebnis\Classy\Test;
+
+final class Php73
+{
+    /**
+     * @return \Generator<string, array{0: Test\Util\Scenario}>
+     */
+    public static function classyConstructs(): \Generator
+    {
+        $scenarios = [
+            Test\Util\Scenario::create(
+                'php73-within-namespace',
+                __DIR__ . '/../Fixture/Classy/Php73/WithinNamespace/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespace\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespace\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespace\Foo::class),
+            ),
+            Test\Util\Scenario::create(
+                'php73-within-namespace-with-braces',
+                __DIR__ . '/../Fixture/Classy/Php73/WithinNamespaceWithBraces/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespaceWithBraces\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespaceWithBraces\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinNamespaceWithBraces\Foo::class),
+            ),
+            Test\Util\Scenario::create(
+                'php73-within-multiple-namespaces-with-braces',
+                __DIR__ . '/../Fixture/Classy/Php73/WithinMultipleNamespaces/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Bar\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Bar\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Bar\Foo::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Foo\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Foo\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Foo\Foo::class),
+            ),
+            Test\Util\Scenario::create(
+                'php73-within-namespace-with-single-segment',
+                __DIR__ . '/../Fixture/Classy/Php73/WithinNamespaceWithSingleSegment/source.php',
+                Construct::fromName('Ergebnis\\Bar'),
+                Construct::fromName('Ergebnis\\Baz'),
+                Construct::fromName('Ergebnis\\Foo'),
+            ),
+            Test\Util\Scenario::create(
+                'php73-with-methods-named-after-keywords',
+                __DIR__ . '/../Fixture/Classy/Php73/WithMethodsNamedAfterKeywords/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php73\WithMethodsNamedAfterKeywords\Foo::class),
+            ),
+            /**
+             * @see https://github.com/zendframework/zend-file/pull/41
+             */
+            Test\Util\Scenario::create(
+                'php73-with-methods-named-after-keywords-and-return-type',
+                __DIR__ . '/../Fixture/Classy/Php73/WithMethodsNamedAfterKeywordsAndReturnType/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php73\WithMethodsNamedAfterKeywordsAndReturnType\Foo::class),
+            ),
+            Test\Util\Scenario::create(
+                'php73-without-namespace',
+                __DIR__ . '/../Fixture/Classy/Php73/WithoutNamespace/source.php',
+                Construct::fromName('Bar'),
+                Construct::fromName('Baz'),
+                Construct::fromName('Foo'),
+            ),
+            Test\Util\Scenario::create(
+                'php73-without-namespace-and-multi-line-comments',
+                __DIR__ . '/../Fixture/Classy/Php73/WithoutNamespaceAndMultiLineComments/source.php',
+                Construct::fromName('Bar'),
+                Construct::fromName('Baz'),
+                Construct::fromName('Foo'),
+            ),
+            Test\Util\Scenario::create(
+                'php73-without-namespace-and-shell-line-comments',
+                __DIR__ . '/../Fixture/Classy/Php73/WithoutNamespaceAndShellStyleComments/source.php',
+                Construct::fromName('Bar'),
+                Construct::fromName('Baz'),
+                Construct::fromName('Foo'),
+            ),
+            Test\Util\Scenario::create(
+                'php73-without-namespace-and-single-line-comments',
+                __DIR__ . '/../Fixture/Classy/Php73/WithoutNamespaceAndSingleLineComments/source.php',
+                Construct::fromName('Bar'),
+                Construct::fromName('Baz'),
+                Construct::fromName('Foo'),
+            ),
+        ];
+
+        foreach ($scenarios as $scenario) {
+            yield $scenario->description() => [
+                $scenario,
+            ];
+        }
+    }
+}

test/Fixture/Classy/Php73/WithMethodsNamedAfterKeywords/source.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithMethodsNamedAfterKeywords;
+
+class Foo
+{
+    public function class()
+    {
+    }
+
+    public function interface()
+    {
+    }
+
+    public function trait()
+    {
+    }
+}

test/Fixture/Classy/Php73/WithMethodsNamedAfterKeywordsAndReturnType/source.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithMethodsNamedAfterKeywordsAndReturnType;
+
+
+class Foo
+{
+    public function class(): string
+    {
+        return '';
+    }
+
+    public function interface(): string
+    {
+        return '';
+    }
+
+    public function trait(): string
+    {
+        return '';
+    }
+}

test/Fixture/Classy/Php73/WithinMultipleNamespaces/source.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Foo;
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinMultipleNamespaces\Bar;
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}

test/Fixture/Classy/Php73/WithinNamespace/source.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinNamespace;
+
+class Foo {}
+
+interface Bar {}
+
+trait Baz {}

test/Fixture/Classy/Php73/WithinNamespaceAndMultiLineComments/source.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinNamespaceAndMultiLineComments;
+
+/* foo */ class /* bar */ Foo /* baz */ {}
+
+/* foo */ interface /* bar */ Bar /* baz */ {}
+
+/* foo */ trait  /* bar */ Baz /* baz */ {}

test/Fixture/Classy/Php73/WithinNamespaceAndShellStyleComments/source.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinNamespaceAndShellStyleComments;
+
+class # foo
+Foo # bar
+{}
+
+interface # foo
+Bar # bar
+{}
+
+trait  # foo
+Baz // bar
+{}

test/Fixture/Classy/Php73/WithinNamespaceAndSingleLineComments/source.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinNamespaceAndSingleLineComments;
+
+class // foo
+Foo // bar
+{}
+
+interface // foo
+Bar // bar
+{}
+
+trait  // foo
+Baz // bar
+{}

test/Fixture/Classy/Php73/WithinNamespaceWithBraces/source.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php73\WithinNamespaceWithBraces
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}

test/Fixture/Classy/Php73/WithinNamespaceWithSingleSegment/source.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Ergebnis;
+
+class Foo {}
+
+interface Bar {}
+
+trait Baz {}

test/Fixture/Classy/Php73/WithoutNamespace/source.php

@@ -0,0 +1,7 @@
+<?php
+
+class Foo {}
+
+interface Bar {}
+
+trait Baz {}

test/Fixture/Classy/Php73/WithoutNamespaceAndMultiLineComments/source.php

@@ -0,0 +1,7 @@
+<?php
+
+/* foo */ class /* bar */ Foo /* baz */ {}
+
+/* foo */ interface /* bar */ Bar /* baz */ {}
+
+/* foo */ trait  /* bar */ Baz /* baz */ {}

test/Fixture/Classy/Php73/WithoutNamespaceAndShellStyleComments/source.php

@@ -0,0 +1,13 @@
+<?php
+
+class # foo
+Foo # bar
+{}
+
+interface # foo
+Bar # bar
+{}
+
+trait  # foo
+Baz // bar
+{}

test/Fixture/Classy/Php73/WithoutNamespaceAndSingleLineComments/source.php

@@ -0,0 +1,13 @@
+<?php
+
+class // foo
+Foo // bar
+{}
+
+interface // foo
+Bar // bar
+{}
+
+trait  // foo
+Baz // bar
+{}

test/Unit/ConstructsTest.php

@@ -103,6 +103,23 @@ public static function provideScenarioWithoutClassyConstructs(): iterable
         }
     }
 
+    /**
+     * @dataProvider \Ergebnis\Classy\Test\DataProvider\Php73::classyConstructs()
+     *
+     * @requires PHP 7.3
+     */
+    public function testFromSourceReturnsListOfClassyConstructsOnPhp73(Test\Util\Scenario $scenario): void
+    {
+        $constructs = Constructs::fromSource($scenario->source());
+
+        $expected = \array_map(static function (Construct $construct): Construct {
+            return Construct::fromName($construct->name());
+        }, $scenario->constructsSortedByName());
+
+        self::assertIsList($constructs);
+        self::assertEquals($expected, $constructs);
+    }
+
     /**
      * @dataProvider \Ergebnis\Classy\Test\DataProvider\Php74::classyConstructs()
      *
@@ -178,6 +195,19 @@ public function testFromDirectoryReturnsEmptyArrayWhenNoClassyConstructsHaveBeen
         self::assertSame([], $constructs);
     }
 
+    /**
+     * @dataProvider \Ergebnis\Classy\Test\DataProvider\Php73::classyConstructs()
+     *
+     * @requires PHP 7.3
+     */
+    public function testFromDirectoryReturnsListOfClassyConstructsOnPhp73(Test\Util\Scenario $scenario): void
+    {
+        $constructs = Constructs::fromDirectory($scenario->directory());
+
+        self::assertIsList($constructs);
+        self::assertEquals($scenario->constructsSortedByName(), $constructs);
+    }
+
     /**
      * @dataProvider \Ergebnis\Classy\Test\DataProvider\Php74::classyConstructs()
      *