Merge 26281b9 into eb7d515

jkphl · Oct 24, 2019 · 463c696 · 463c696
2 parents eb7d515 + 26281b9
commit 463c696
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 34 deletions.
diff --git a/src/Micrometa/Tests/AbstractTestBase.php b/src/Micrometa/Tests/AbstractTestBase.php
@@ -55,21 +55,18 @@ abstract class AbstractTestBase extends TestCase
      *
      * @var string
      */
-    protected static $fixture;
+    protected static $fixture =  __DIR__.DIRECTORY_SEPARATOR.'Fixture'.DIRECTORY_SEPARATOR;
+
     /**
      * Logger
      *
      * @var LoggerInterface
      */
-    protected static $logger;
+    private static $logger;
 
-    /**
-     * Setup
-     */
-    public static function setUpBeforeClass()
+    protected static function getLogger() : LoggerInterface
     {
-        self::$fixture = __DIR__.DIRECTORY_SEPARATOR.'Fixture'.DIRECTORY_SEPARATOR;
-        self::$logger  = new ExceptionLogger();
+        return self::$logger ?? self::$logger = new ExceptionLogger();
     }
 
     /**

diff --git a/src/Micrometa/Tests/Application/ExtractorTest.php b/src/Micrometa/Tests/Application/ExtractorTest.php
@@ -55,23 +55,6 @@
  */
 class ExtractorTest extends AbstractTestBase
 {
-    /**
-     * Microformats tests root path
-     *
-     * @var string
-     */
-    protected static $microformatsTests;
-
-    /**
-     * Setup before all tests
-     */
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$microformatsTests = \ComposerLocator::getPath('mf2/tests').DIRECTORY_SEPARATOR.'tests'.
-                                   DIRECTORY_SEPARATOR.'microformats-v2'.DIRECTORY_SEPARATOR;
-    }
-
     /**
      * Test the RDFa Lite 1.1 extraction
      */
@@ -82,7 +65,7 @@ public function testRdfaLiteExtraction()
         $this->assertInstanceOf(\DOMDocument::class, $rdfaLiteDom);
 
         // Create an RDFa Lite 1.1 parser
-        $rdfaLiteParser = new RdfaLite($rdfaLiteUri, self::$logger);
+        $rdfaLiteParser = new RdfaLite($rdfaLiteUri, self::getLogger());
         $this->assertEquals($rdfaLiteUri, $rdfaLiteParser->getUri());
 
         // Create an extractor service
@@ -121,8 +104,11 @@ public function testMicrodataExtraction()
      */
     public function testMicroformatsExtraction()
     {
+        $microformatsTests = \ComposerLocator::getPath('mf2/tests').DIRECTORY_SEPARATOR.'tests'.
+            DIRECTORY_SEPARATOR.'microformats-v2'.DIRECTORY_SEPARATOR;
+
         $this->getAndTestMicroformatsExtractionBase(
-            self::$microformatsTests.'h-product'.DIRECTORY_SEPARATOR.'aggregate.html'
+            $microformatsTests.'h-product'.DIRECTORY_SEPARATOR.'aggregate.html'
         );
     }
 

diff --git a/src/Micrometa/Tests/Infrastructure/ParserFactoryTest.php b/src/Micrometa/Tests/Infrastructure/ParserFactoryTest.php
@@ -61,7 +61,7 @@ public function testParserFactory()
     {
         $formats = Microformats::FORMAT | Microdata::FORMAT | JsonLD::FORMAT | RdfaLite::FORMAT | LinkType::FORMAT;
         $uri     = 'http://localhost/example.html';
-        $parsers = ParserFactory::createParsersFromFormats($formats, Http::createFromString($uri), self::$logger);
+        $parsers = ParserFactory::createParsersFromFormats($formats, Http::createFromString($uri), self::getLogger());
 
         /**
          * @var int $parserFormat

diff --git a/src/Micrometa/Tests/Infrastructure/ParserTest.php b/src/Micrometa/Tests/Infrastructure/ParserTest.php
@@ -61,7 +61,7 @@ class ParserTest extends AbstractTestBase
     public function testLanguageJsonLDParser()
     {
         list($uri, $dom) = $this->getUriFixture('json-ld/jsonld-languages.html');
-        $parser = new JsonLD($uri, self::$logger);
+        $parser = new JsonLD($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(1, count($items));
@@ -112,7 +112,7 @@ public function testInvalidJsonLDParser()
     public function testMicroformatsParser()
     {
         list($uri, $dom) = $this->getUriFixture('microformats/entry.html');
-        $parser = new Microformats($uri, self::$logger);
+        $parser = new Microformats($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(1, count($items));
@@ -126,7 +126,7 @@ public function testMicroformatsParser()
     public function testNestedMicroformatsParser()
     {
         list($uri, $dom) = $this->getUriFixture('microformats/nested-events.html');
-        $parser = new Microformats($uri, self::$logger);
+        $parser = new Microformats($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(1, count($items));
@@ -141,7 +141,7 @@ public function testNestedMicroformatsParser()
     public function testMicrodataParser()
     {
         list($uri, $dom) = $this->getUriFixture('html-microdata/article-microdata.html');
-        $parser = new Microdata($uri, self::$logger);
+        $parser = new Microdata($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(1, count($items));
@@ -156,7 +156,7 @@ public function testMicrodataParser()
     public function testRdfaLiteParser()
     {
         list($uri, $dom) = $this->getUriFixture('rdfa-lite/article-rdfa-lite.html');
-        $parser = new RdfaLite($uri, self::$logger);
+        $parser = new RdfaLite($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(1, count($items));
@@ -171,7 +171,7 @@ public function testRdfaLiteParser()
     public function testLinkTypeParser()
     {
         list($uri, $dom) = $this->getUriFixture('link-type/valid-test.html');
-        $parser = new LinkType($uri, self::$logger);
+        $parser = new LinkType($uri, self::getLogger());
         $items  = $parser->parseDom($dom)->getItems();
         $this->assertTrue(is_array($items));
         $this->assertEquals(4, count($items));