Releasing v1.0.0

- Breaks backwards-compatibility with controller configuration, it's now setup to work the same way as services.php

Author: girvo

composer.json

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

composer.lock

@@ -49,6 +49,8 @@ public function loadConfig($configFile)
 
     public function loadControllers($controllerFile = '')
     {
+        $this->register(new ServiceControllerServiceProvider());
+
         if ($controllerFile === '') {
             $controllerFile = $this->getAppConfig()['core']['configDir'] . $this->getAppConfig()['core']['controllersFile'];
         }
@@ -62,22 +64,6 @@ public function loadControllers($controllerFile = '')
         return $this;
     }
 
-    public function configureControllers()
-    {
-        $this->register(new ServiceControllerServiceProvider());
-
-        foreach ($this->getControllers() as $name => $callable) {
-            if (! is_callable($callable)) {
-                throw new InvalidControllerException('Controller `'.$name.'` is not a callable');
-            }
-
-            $app = $this;
-            $app[$name . '.controller'] = $app->share($callable);
-        }
-
-        return $this;
-    }
-
     public function configureRoutes()
     {
         $routesFile = $this->getAppConfig()['core']['configDir'] . $this->getAppConfig()['core']['routesFile'];
@@ -93,7 +79,7 @@ public function configureServices()
         $servicesFile = $this->getAppConfig()['core']['configDir'] . $this->getAppConfig()['core']['servicesFile'];
 
         $serviceParser = ServiceParser::getInstance($servicesFile);
-        $serviceParser->loadServices()->parse();
+        $serviceParser->loadServices()->loadControllers($this->getControllers())->parse();
 
         // Sets up the Validator service provider
         $this->register(new ValidatorServiceProvider());
@@ -105,9 +91,8 @@ public function run(\Symfony\Component\HttpFoundation\Request $request = NULL)
     {
         $serviceOverride = null;
 
-        $this->configureServices()
-            ->loadControllers()
-            ->configureControllers()
+        $this->loadControllers()
+            ->configureServices()
             ->configureRoutes();
 
         if (method_exists($this, 'init')) {

src/App.php

@@ -19,6 +19,7 @@ class ServiceParser
 
     protected $servicesFile = '';
     protected $services = null;
+    protected $controllers = null;
 
     public function __construct($servicesFile)
     {
@@ -38,16 +39,48 @@ public function loadServices()
         return $this;
     }
 
+    public function loadControllers(array $controllers)
+    {
+        // Munge the controllers
+        $fixed = [];
+        foreach ($controllers as $name => $value) {
+            // Make sure it's shared
+            if (array_key_exists('share', $value) === false
+             || $value['share'] !== true) {
+                $value['share'] = true;
+            }
+
+            // Ensure it's name ends with 'controller'
+            if (substr($name, strlen($name) - strlen('.controller')) !== '.controller') {
+                throw new InvalidControllersFileException('ControllerService names must end in ".controller": ' . $name);
+            }
+
+            $fixed[$name] = $value;
+        }
+
+        $this->setControllers($fixed);
+
+        return $this;
+    }
+
     // TODO: Add in support for "shared" and "protected" callbacks
     public function parse()
     {
         $app = \Flint\App::getInstance();
-        $raw = $this->getServices();
+        $services = $this->getServices();
+        $controllers = $this->getControllers();
 
-        if ($raw === null) {
+        if ($services === null) {
             throw new \ErrorException('Trying to parse loaded services before loading the file.');
         }
 
+        // Append the controllers onto the service definitions
+        if ($controllers === null) {
+            $controllers = [];
+        }
+
+        $raw = array_merge($services, $controllers);
+
         foreach ($raw as $name => $values) {
             if (isset($values['shared']) && $values['shared'] === true) {
                 // Shared service; ie: saves a single copy of the object passed in

src/ServiceParser.php

@@ -1,7 +1,8 @@
 <?php
 
 return [
-    'fake' => function() {
-        return new FakeController();
-    }
+    'fake.controller' => [
+        'class' => 'FakeController',
+        'arguments' => []
+    ]
 ];

tests/data/controllers.php

@@ -48,54 +48,11 @@ public function testConfigOverride()
         $this->assertArrayHasKey('configDir', $config['core']);
     }
 
-    /**
-     * @expectedException \Flint\Exception\InvalidControllersFileException
-     */
-    public function testInvalidControllersFileThrowsException()
-    {
-        $this->config['core']['controllersFile'] = 'abcd12345.php';
-
-        $app = App::getInstance($this->config);
-        $app->loadControllers();
-    }
-
-    public function testLoadingRealControllers()
-    {
-        $app = App::getInstance($this->config);
-
-        $controllers = $app->loadControllers()->getControllers();
-
-        $this->assertTrue(is_array($controllers));
-        $this->assertArrayHasKey('fake', $controllers);
-        $this->assertArrayNotHasKey('testing', $controllers);
-    }
-
-    /**
-     * @expectedException \Flint\Exception\InvalidControllerException
-     */
-    public function testInvalidControllerThrowsException()
-    {
-        $this->config['core']['controllersFile'] = '/controllers.invalid.php';
-        $app = App::getInstance($this->config);
-
-        $app->loadControllers()
-            ->configureControllers();
-    }
-
-    public function testControllersLoadedIntoSilex()
-    {
-        $app = App::getInstance($this->config);
-
-        $app->loadControllers()
-            ->configureControllers();
-
-        $this->assertArrayHasKey('fake.controller', $app);
-    }
-
     public function testServicesLoadedIntoPimple()
     {
         $app = App::getInstance($this->config);
 
+        $app->loadControllers();
         $app->configureServices();
 
         $this->assertArrayHasKey('Fake', $app);
@@ -109,7 +66,7 @@ public function testRoutesAreLoadedInCorrectly()
         $app = App::getInstance($this->config);
 
         $app->loadControllers()
-            ->configureControllers()
+            ->configureServices()
             ->configureRoutes();
 
         // Now see if the routes are loaded

tests/unit/AppTest.php

@@ -16,6 +16,7 @@ public function setUp()
             'core' => [
                 'configDir' => __DIR__ . '/../data',
                 'controllersFile' => '/controllers.php',
+                'servicesFile' => '/services.php',
                 'routesFile' => '/routes.php'
             ]
         ];
@@ -56,7 +57,7 @@ public function testRouteParsing()
         $parser = new RouteParser($file);
 
         $this->app->loadControllers()
-            ->configureControllers();
+            ->configureServices();
 
         $parser->loadRoutes()->parse();
 
@@ -117,7 +118,7 @@ public function testConverterLoadedAndRuns()
         $parser = new RouteParser($file);
 
         $this->app->loadControllers()
-            ->configureControllers();
+            ->configureServices();
 
         $parser->loadRoutes()->parse();
 

tests/unit/RouteParserTest.php

@@ -9,9 +9,12 @@
 class ServiceParserTest extends \PHPUnit_Framework_TestCase
 {
     private $fakeConfig1 = [ 'hello' => 'world' ];
-    private $fakeConfig2 = [
+    private $fakeConfig2 = [];
 
-    ];
+    public function setUp()
+    {
+        ServiceParser::destroyInstance();
+    }
 
     public function tearDown()
     {
@@ -23,7 +26,7 @@ public function testCorrectInitialisation()
     {
         $parser = ServiceParser::getInstance('fakefile.php');
 
-        $this->assertTrue('fakefile.php' === $parser->getServicesFile());
+        $this->assertEquals('fakefile.php', $parser->getServicesFile());
     }
 
     public function testLoadServicesFileIntoParser()