Merge branch 'hotfix/PathCorrections'

heiglandreas · Feb 18, 2017 · 1e0f9a5 · 1e0f9a5
2 parents de8f0e2 + d9bb7b8
commit 1e0f9a5
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 57 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,22 +1,28 @@
 <?php
 
-namespace OrgHeiglContact;
+namespace Org_Heigl\Contact;
 
-return array(
-	'service_manager' => array(
-		'factories' => array(
-			'message'   => 'OrgHeiglContact\Service\MailMessageFactory',
-			'transport' => 'OrgHeiglContact\Service\MailTransportFactory',
-		),
-		'invokables' => array(
-			'OrgHeiglContact\Form\ContactForm' => 'OrgHeiglContact\Form\ContactForm',
-		),
-	),
-	'controllers' => array(
-		'factories' => array(
-			'OrgHeiglContact\Controller\ContactController' => 'OrgHeiglContact\Service\ContactControllerFactory'
-		),
-	),
+use Org_Heigl\Contact\Controller\ContactController;
+use Org_Heigl\Contact\Form\ContactForm;
+use Org_Heigl\Contact\Service\ContactControllerFactory;
+use Org_Heigl\Contact\Service\MailMessageFactory;
+use Org_Heigl\Contact\Service\MailTransportFactory;
+
+return [
+	'service_manager' => [
+		'factories' => [
+			'message'   => MailMessageFactory::class,
+			'transport' => MailTransportFactory::class,
+		],
+		'invokables' => [
+			ContactForm::class => ContactForm::class,
+		],
+	],
+	'controllers' => [
+		'factories' => [
+			ContactController::class => ContactControllerFactory::class,
+		],
+	],
 	'view_manager' => array(
 			'display_not_found_reason' => true,
 			'display_exceptions'       => true,
@@ -28,39 +34,39 @@
 					__DIR__ . '/../view',
 			),
 	),	
-	'router' => array(
-        'routes' => array(
-            'contact' => array(
+	'router' => [
+        'routes' => [
+            'contact' => [
                 'type' => 'Literal',
-                'options' => array(
+                'options' => [
                     'route' => '/contact',
-                    'defaults' => array(
-                        'controller' => 'OrgHeiglContact\Controller\ContactController',
+                    'defaults' => [
+                        'controller' => ContactController::class,
                         'action'     => 'index',
-                    ),
-                ),
+                    ],
+                ],
                 'may_terminate' => true,
-                'child_routes' => array(
-                    'process' => array(
+                'child_routes' => [
+                    'process' => [
                         'type' => 'Literal',
-                        'options' => array(
+                        'options' => [
                             'route' => '/process',
-                            'defaults' => array(
+                            'defaults' => [
                                 'action'     => 'process',
-                            ),
-                        ),
-                    ),
-                    'thank-you' => array(
+                            ],
+                        ],
+                    ],
+                    'thank-you' => [
                         'type' => 'Literal',
-                        'options' => array(
+                        'options' => [
                             'route' => '/thank-you',
-                            'defaults' => array(
+                            'defaults' => [
                                 'action'     => 'thank-you',
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-        ),
-    )
-);
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ]
+];
diff --git a/src/Controller/ContactController.php b/src/Controller/ContactController.php
@@ -154,7 +154,7 @@ public function processAction()
                         'error' => true,
                         'form'  => $form
             ));
-            $view->setTemplate('org-heigl-contact/contact/index');
+            $view->setTemplate('org_heigl/contact/contact/index');
             return $view;
         }
 

diff --git a/src/Module.php b/src/Module.php
@@ -58,17 +58,6 @@ public function onBootstrap(MvcEvent $event)
 
     public function getConfig()
     {
-    	return include __DIR__ . '/config/module.config.php';
-    }
-
-    public function getAutoloaderConfig()
-    {
-    	return array(
-    			'Zend\Loader\StandardAutoloader' => array(
-    					'namespaces' => array(
-    							__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-    					),
-    			),
-    	);
+    	return include __DIR__ . '/../config/module.config.php';
     }
 }
diff --git a/src/Service/ContactControllerFactory.php b/src/Service/ContactControllerFactory.php
@@ -33,6 +33,7 @@
 
 use Interop\Container\ContainerInterface;
 use Org_Heigl\Contact\Controller\ContactController;
+use Org_Heigl\Contact\Form\ContactForm;
 use Zend\ServiceManager\Factory\FactoryInterface;
 
 
@@ -60,7 +61,7 @@ class ContactControllerFactory implements FactoryInterface
 	 */
  	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
  	{
-	 	$form      = $container->get('OrgHeiglContact\Form\ContactForm');
+	 	$form      = $container->get(ContactForm::class);
  		$message   = $container->get('message');
  		$transport = $container->get('transport');
 

diff --git a/src/Service/MailMessageFactory.php b/src/Service/MailMessageFactory.php
@@ -39,7 +39,7 @@
 
 class MailMessageFactory implements FactoryInterface
 {
-	public function createService(ContainerInterface $container, $requestedName, array $options = null)
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
 	{
 		$config  = $container->get('config');
 		if ($config instanceof Traversable) {

diff --git a/view/org-heigl-contact/contact/index.phtml → view/org_heigl/contact/contact/index.phtml b/view/org-heigl-contact/contact/index.phtml → view/org_heigl/contact/contact/index.phtml
diff --git a/...org-heigl-contact/contact/thank-you.phtml → ...org_heigl/contact/contact/thank-you.phtml b/...org-heigl-contact/contact/thank-you.phtml → ...org_heigl/contact/contact/thank-you.phtml