InvokableFactory usage and short array syntax in layout

weierophinney · Apr 20, 2016 · bd6d236 · bd6d236
1 parent 73e7263
commit bd6d236
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -7,6 +7,8 @@
 
 namespace Application;
 
+use Zend\ServiceManager\Factory\InvokableFactory;
+
 return [
     'router' => [
         'routes' => [
@@ -15,7 +17,7 @@
                 'options' => [
                     'route'    => '/',
                     'defaults' => [
-                        'controller' => 'Application\Controller\Index',
+                        'controller' => Controller\IndexController::class,
                         'action'     => 'index',
                     ],
                 ],
@@ -30,7 +32,7 @@
                     'route'    => '/application',
                     'defaults' => [
                         '__NAMESPACE__' => 'Application\Controller',
-                        'controller'    => 'Index',
+                        'controller'    => 'IndexController',
                         'action'        => 'index',
                     ],
                 ],
@@ -53,8 +55,8 @@
         ],
     ],
     'controllers' => [
-        'invokables' => [
-            'Application\Controller\Index' => Controller\IndexController::class
+        'factories' => [
+            Controller\IndexController::class => InvokableFactory::class,
         ],
     ],
     'view_manager' => [

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -11,7 +11,7 @@
         ?>
 
         <!-- Le styles -->
-        <?php echo $this->headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'))
+        <?php echo $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'])
                         ->prependStylesheet($this->basePath('css/style.css'))
                         ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
                         ->prependStylesheet($this->basePath('css/bootstrap.min.css')) ?>
@@ -20,8 +20,8 @@
         <?php echo $this->headScript()
             ->prependFile($this->basePath('js/bootstrap.min.js'))
             ->prependFile($this->basePath('js/jquery.min.js'))
-            ->prependFile($this->basePath('js/respond.min.js'), 'text/javascript', array('conditional' => 'lt IE 9',))
-            ->prependFile($this->basePath('js/html5shiv.min.js'), 'text/javascript', array('conditional' => 'lt IE 9',))
+            ->prependFile($this->basePath('js/respond.min.js'), 'text/javascript', ['conditional' => 'lt IE 9',])
+            ->prependFile($this->basePath('js/html5shiv.min.js'), 'text/javascript', ['conditional' => 'lt IE 9',])
         ; ?>
 
     </head>