ServiceParser is no longer a singleton

This fixes some test issues in app-level code. Bumps version to v1.0.9

Author: girvo

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "studionone/flint",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "repositories": [
         {
             "type": "vcs",

src/App.php

@@ -78,7 +78,7 @@ public function configureServices()
     {
         $servicesFile = $this->getAppConfig()['core']['configDir'] . $this->getAppConfig()['core']['servicesFile'];
 
-        $serviceParser = ServiceParser::getInstance($servicesFile);
+        $serviceParser = new ServiceParser($servicesFile);
         $serviceParser->loadServices()->loadControllers($this->getControllers())->parse();
 
         // Sets up the Validator service provider

tests/unit/AppTest.php

@@ -57,8 +57,6 @@ public function testServicesLoadedIntoPimple()
 
         $this->assertArrayHasKey('Fake', $app);
         $this->assertArrayHasKey('Fake2', $app);
-
-        ServiceParser::destroyInstance();
     }
 
     public function testRoutesAreLoadedInCorrectly()

tests/unit/ServiceParserTest.php

@@ -24,7 +24,7 @@ public function tearDown()
 
     public function testCorrectInitialisation()
     {
-        $parser = ServiceParser::getInstance('fakefile.php');
+        $parser = new ServiceParser('fakefile.php');
 
         $this->assertEquals('fakefile.php', $parser->getServicesFile());
     }
@@ -41,7 +41,7 @@ public function testLoadServicesFileIntoParser()
 
         SingletonMock::inject($confStub, 'Flint\Config');
 
-        $parser = ServiceParser::getInstance('fakefile.php');
+        $parser = new ServiceParser('fakefile.php');
         $parser->loadServices();
 
         $this->assertArrayHasKey('hello', $parser->getServices());
@@ -54,7 +54,7 @@ public function testLoadServicesFileIntoParser()
      */
     public function testInvalidServiceFileThrowsException()
     {
-        $parser = ServiceParser::getInstance('blah');
+        $parser = new ServiceParser('blah');
         $parser->loadServices();
     }
 
@@ -72,7 +72,7 @@ public function testEmptyServiceParseCallThrowsException()
             ]
         ]);
 
-        $parser = ServiceParser::getInstance('fakefile.php');
+        $parser = new ServiceParser('fakefile.php');
         $parser->parse();
     }
 
@@ -116,11 +116,10 @@ public function testServicesLoadedIntoAppCorrectly()
 
         SingletonMock::inject($stub, 'Flint\ServiceParser');
 
-        $parser = ServiceParser::getInstance();
-        $parser->loadServices()
+        $stub->loadServices()
             ->setServices($serviceConfig);
 
-        $result = $parser->parse();
+        $result = $stub->parse();
 
         $this->assertArrayHasKey('Fake', $result);
         $this->assertArrayHasKey('Fake2', $result);
@@ -169,11 +168,10 @@ public function testSharedServiceWithArgLoadedCorrectly()
 
         SingletonMock::inject($stub, 'Flint\ServiceParser');
 
-        $parser = ServiceParser::getInstance();
-        $parser->loadServices()
+        $stub->loadServices()
             ->setServices($serviceConfig);
 
-        $result = $parser->parse();
+        $result = $stub->parse();
         $this->assertArrayHasKey('Fake', $result);
         $time = $result['Fake']->getTime();
         $this->assertEquals('Josh', $result['Fake']->getName());