build(deps-dev): bump lunr/halo from 0.8.1 to 0.10.0 (#634)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sean Molenaar <[email protected]>
SMillerDev · Sep 29, 2024 · 71bb7ec · 71bb7ec
1 parent f010ccd
commit 71bb7ec
Show file tree

Hide file tree

Showing 35 changed files with 238 additions and 355 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "rize/uri-template": "*"
   },
   "require-dev": {
-    "lunr/halo": "~0.8.0",
+    "lunr/halo": "~0.10.0",
     "phpunit/phpunit": "~10.0",
     "theseer/autoload": "~1.0",
     "phing/phing": "~3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/PHPDraft/In/Tests/ApibFileParserTest.php b/src/PHPDraft/In/Tests/ApibFileParserTest.php
@@ -19,15 +19,18 @@
  */
 class ApibFileParserTest extends LunrBaseTest
 {
+
+    private ApibFileParser $class;
+
     /**
      * Set up tests.
      *
      * @return void Test is now set up.
      */
     public function setUp(): void
     {
-        $this->class      = new ApibFileParser(__DIR__ . '/ApibFileParserTest.php');
-        $this->reflection = new ReflectionClass('PHPDraft\In\ApibFileParser');
+        $this->class = new ApibFileParser(__DIR__ . '/ApibFileParserTest.php');
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -36,9 +39,7 @@ public function setUp(): void
      */
     public function testLocationSetup(): void
     {
-        $property = $this->reflection->getProperty('location');
-        $property->setAccessible(true);
-        $this->assertSame(__DIR__ . '/', $property->getValue($this->class));
+        $this->assertPropertyEquals('location', __DIR__ . '/');
     }
 
     /**
@@ -47,9 +48,7 @@ public function testLocationSetup(): void
      */
     public function testFilenameSetup(): void
     {
-        $property = $this->reflection->getProperty('filename');
-        $property->setAccessible(true);
-        $this->assertSame(__DIR__ . '/ApibFileParserTest.php', $property->getValue($this->class));
+        $this->assertPropertySame('filename', __DIR__ . '/ApibFileParserTest.php');
     }
 
     /**
@@ -63,9 +62,7 @@ public function testFilenameSetupWrong(): void
         $this->expectExceptionMessageMatches('/API File not found: .*\/drafter\/non_existing_including_apib/');
         $this->expectExceptionCode(1);
 
-        $property = $this->reflection->getProperty('filename');
-        $property->setAccessible(true);
-        $property->setValue($this->class, TEST_STATICS . '/drafter/non_existing_including_apib');
+        $this->set_reflection_property_value('filename', TEST_STATICS . '/drafter/non_existing_including_apib');
         $this->class->parse();
     }
 
@@ -75,21 +72,15 @@ public function testFilenameSetupWrong(): void
      */
     public function testParseBasic(): void
     {
-        $property = $this->reflection->getProperty('filename');
-        $property->setAccessible(true);
-        $property->setValue($this->class, TEST_STATICS . '/drafter/apib/including.apib');
-        $loc_property = $this->reflection->getProperty('location');
-        $loc_property->setAccessible(true);
-        $loc_property->setValue($this->class, TEST_STATICS . '/drafter/apib/');
-
-        $this->mock_function('curl_exec', function () {
-            return 'hello';
-        });
+        $this->set_reflection_property_value('filename', TEST_STATICS . '/drafter/apib/including.apib');
+        $this->set_reflection_property_value('location', TEST_STATICS . '/drafter/apib/');
+
+
+        $this->mock_function('curl_exec', fn() => 'hello');
+
         $this->class->parse();
-        $this->unmock_function('curl_exec');
 
-        $full_property = $this->reflection->getProperty('full_apib');
-        $full_property->setAccessible(true);
+        $this->unmock_function('curl_exec');
 
         $text = "FORMAT: 1A\nHOST: https://owner-api.teslamotors.com\n";
         $text .= "EXTRA_HOSTS: https://test.owner-api.teslamotors.com\nSOMETHING: INFO\n\n";
@@ -98,7 +89,7 @@ public function testParseBasic(): void
         $text .= " functionality to monitor and control the Model S remotely.\n\nTEST";
         $text .= "\n\n# Hello\nThis is a test.\nhello";
 
-        $this->assertSame($text, $full_property->getValue($this->class));
+        $this->assertPropertyEquals('full_apib', $text);
         $this->assertSame($text, $this->class->__toString());
     }
 

diff --git a/src/PHPDraft/Model/Elements/ArrayStructureElement.php b/src/PHPDraft/Model/Elements/ArrayStructureElement.php
@@ -64,7 +64,7 @@ public function __toString(): string
                 $desc = MarkdownExtra::defaultTransform($this->description);
             }
 
-            return "<tr><td>{$this->key}</td><td>{$type}</td><td>{$desc}</td></tr>";
+            return "<tr><td>$this->key</td><td>$type</td><td>$desc</td></tr>";
         }
 
         $return = '';

diff --git a/src/PHPDraft/Model/Elements/BasicStructureElement.php b/src/PHPDraft/Model/Elements/BasicStructureElement.php
@@ -23,7 +23,7 @@ abstract class BasicStructureElement implements StructureElement
      *
      * @var string|null
      */
-    public ?string $type;
+    public ?string $type = null;
     /**
      * Object description.
      *
@@ -65,7 +65,7 @@ abstract class BasicStructureElement implements StructureElement
      *
      * @var string[]|null
      */
-    public ?array $deps;
+    public ?array $deps = null;
 
     /**
      * Parse a JSON object to a structure.

diff --git a/src/PHPDraft/Model/Elements/ElementStructureElement.php b/src/PHPDraft/Model/Elements/ElementStructureElement.php
@@ -52,8 +52,8 @@ public function __toString(): string
     {
         $type = $this->get_element_as_html($this->type);
 
-        $desc  = is_null($this->description) ? '' : " - <span class=\"description\">{$this->description}</span>";
-        $value = is_null($this->value) ? '' : " - <span class=\"example-value pull-right\">{$this->value}</span>";
+        $desc  = is_null($this->description) ? '' : " - <span class=\"description\">$this->description</span>";
+        $value = is_null($this->value) ? '' : " - <span class=\"example-value pull-right\">$this->value</span>";
         return '<li class="list-group-item mdl-list__item">' . $type . $desc . $value . '</li>';
     }
 

diff --git a/src/PHPDraft/Model/Elements/EnumStructureElement.php b/src/PHPDraft/Model/Elements/EnumStructureElement.php
@@ -91,7 +91,7 @@ public function __toString(): string
         $type = $this->get_element_as_html($this->element);
         $desc = $this->description === null ? '' : MarkdownExtra::defaultTransform($this->description);
 
-        return "<tr><td>{$this->key->value}</td><td>{$type}</td><td>{$desc}</td></tr>";
+        return "<tr><td>{$this->key->value}</td><td>$type</td><td>$desc</td></tr>";
     }
 
     /**

diff --git a/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ArrayStructureElementTest.php
@@ -26,8 +26,8 @@ class ArrayStructureElementTest extends LunrBaseTest
      */
     public function setUp(): void
     {
-        $this->class      = new ArrayStructureElement();
-        $this->reflection = new \ReflectionClass('PHPDraft\Model\Elements\ArrayStructureElement');
+        $this->class = new ArrayStructureElement();
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -179,8 +179,7 @@ public static function parseObjectProvider(): array
      */
     public function testNewInstance(): void
     {
-        $method = $this->reflection->getMethod('new_instance');
-        $method->setAccessible(true);
+        $method = $this->get_reflection_method('new_instance');
         $return = $method->invoke($this->class);
         $this->assertInstanceOf(ArrayStructureElement::class, $return);
     }

diff --git a/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php
@@ -22,28 +22,27 @@
  */
 class BasicStructureElementTest extends LunrBaseTest
 {
+    private BasicStructureElement $class;
+
     /**
      * Set up tests
      *
      * @return void
-     * @throws \ReflectionException
      */
     public function setUp(): void
     {
         $this->class      = $this->getMockBuilder('\PHPDraft\Model\Elements\BasicStructureElement')
                                  ->disableOriginalConstructor()
                                  ->getMockForAbstractClass();
-        $this->reflection = new ReflectionClass($this->class);
+        $this->baseSetUp($this->class);
     }
 
     /**
      * Test if the value the class is initialized with is correct
      */
     public function testSetupCorrectly(): void
     {
-        $property = $this->reflection->getProperty('element');
-        $property->setAccessible(true);
-        $this->assertNull($property->getValue($this->class));
+        $this->assertPropertyEquals('element', NULL);
     }
 
     /**
@@ -102,8 +101,7 @@ public function testParseCommonDeps(): void
         $answer->type = 'cat';
         $answer->description = null;
 
-        $method = $this->reflection->getMethod('parse_common');
-        $method->setAccessible(true);
+        $method = $this->get_reflection_method('parse_common');
         $method->invokeArgs($this->class, [json_decode($json), &$dep]);
 
         $this->assertEquals($answer->key, $this->class->key);
@@ -124,7 +122,7 @@ public function testParseCommonDeps(): void
     public function testParseCommon($value, BasicStructureElement $expected_value): void
     {
         $dep = [];
-        $method = $this->get_accessible_reflection_method('parse_common');
+        $method = $this->get_reflection_method('parse_common');
         $method->invokeArgs($this->class, [$value, &$dep]);
 
         $this->assertEquals($expected_value->key, $this->class->key);

diff --git a/src/PHPDraft/Model/Elements/Tests/ElementStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ElementStructureElementTest.php
@@ -12,13 +12,15 @@
  */
 class ElementStructureElementTest extends LunrBaseTest
 {
+    private ElementStructureElement $class;
+
     /**
      * Set up
      */
     public function setUp(): void
     {
-        $this->class      = new ElementStructureElement();
-        $this->reflection = new ReflectionClass('PHPDraft\Model\Elements\ElementStructureElement');
+        $this->class = new ElementStructureElement();
+        $this->baseSetUp($this->class);
     }
 
     /**

diff --git a/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php
@@ -25,27 +25,24 @@ class EnumStructureElementTest extends LunrBaseTest
      */
     public function setUp(): void
     {
-        $this->class      = new EnumStructureElement();
-        $this->reflection = new \ReflectionClass('PHPDraft\Model\Elements\EnumStructureElement');
+        $this->class = new EnumStructureElement();
+        $this->baseSetUp($this->class);
     }
 
     /**
      * Test if the value the class is initialized with is correct
      */
     public function testSetupCorrectly(): void
     {
-        $property = $this->reflection->getProperty('element');
-        $property->setAccessible(true);
-        $this->assertNull($property->getValue($this->class));
+        $this->assertPropertyEquals('element', NULL);
     }
 
     /**
      * Test setup of new instances
      */
     public function testNewInstance(): void
     {
-        $method = $this->reflection->getMethod('new_instance');
-        $method->setAccessible(true);
+        $method = $this->get_reflection_method('new_instance');
         $return = $method->invoke($this->class);
         $this->assertInstanceOf(EnumStructureElement::class, $return);
     }

diff --git a/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php
@@ -23,15 +23,17 @@
  */
 class ObjectStructureElementTest extends LunrBaseTest
 {
+    private ObjectStructureElement $class;
+
     /**
      * Set up tests
      *
      * @return void
      */
     public function setUp(): void
     {
-        $this->class      = new ObjectStructureElement();
-        $this->reflection = new ReflectionClass('PHPDraft\Model\Elements\ObjectStructureElement');
+        $this->class = new ObjectStructureElement();
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -41,8 +43,7 @@ public function setUp(): void
      */
     public function testNewInstance(): void
     {
-        $method = $this->reflection->getMethod('new_instance');
-        $method->setAccessible(true);
+        $method = $this->get_reflection_method('new_instance');
         $return = $method->invoke($this->class);
         $this->assertInstanceOf(ObjectStructureElement::class, $return);
     }
@@ -210,7 +211,7 @@ public function testEmptyParse(): void
         $deps = [];
         $return = $this->class->parse(null, $deps);
         $this->assertInstanceOf(ObjectStructureElement::class, $return);
-        $object = new \stdClass();
+        $object = (object)[];
         $object->key = 'key';
         $return = $this->class->parse($object, $deps);
         $this->assertInstanceOf(ObjectStructureElement::class, $return);