Merge remote-tracking branch 'weierophinney/feature/view-layer'

diff --git a/.gitmodules b/.gitmodules
index a974f87..8f630ff 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vendor/ZendFramework"]
        path = vendor/ZendFramework
-       url = git://github.com/weierophinney/zf2.git
+       url = git://github.com/zendframework/zf2.git

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index 4f4ed2a..4d3c4e6 100644 (file)
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -25,7 +25,7 @@ echo $this->doctype();
     <meta charset="utf-8">
     <?php echo $this->headTitle('ZF2 Skeleton Application') ?>
 
-    <?php echo $this->headMeta() ?>
+    <?php echo $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?>
 
     <!-- Le styles -->
     <?php echo $this->headLink() ?>

diff --git a/public/index.php b/public/index.php
index 60730da..5e89d16 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,7 +1,7 @@
 <?php
 chdir(dirname(__DIR__));
 require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
+Zend\Loader\AutoloaderFactory::factory();
 
 $appConfig = include 'config/application.config.php';
 

diff --git a/vendor/ZendFramework b/vendor/ZendFramework
index ab750ae..2141369 160000 (submodule)
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit ab750ae8afb061b1919186cce13159132bf250ca
+Subproject commit 2141369ca32da2cbabbe5ddea546c806dd4ca7f5