Merge branch 'hotfix/code-cleanup' of https://github.com/Maks3w/zf2 i…

…nto hotfix/uses-annotations
zendframework · May 10, 2012 · 3962f1e · 3962f1e
16 parents 1dd5d72 + 9bc304a + 479b8c7 + 41fab24 + 467f8b2 + 30bb6f0 + f8cc896 + 2ee0afd + 656f0b0 + 7092cb4 + 5e1b259 + abb3ff8 + 39a873f + b6e6c92 + 80aee85 + 1bd853f
commit 3962f1e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/AbstractFactoryInterface.php b/src/AbstractFactoryInterface.php
@@ -6,4 +6,4 @@ interface AbstractFactoryInterface
 {
     public function canCreateServiceWithName($name /*, $requestedName */);
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name /*, $requestedName */);
-}
+}
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -68,4 +68,4 @@ public function configureServiceManager(ServiceManager $serviceManager)
         }
     }
 
-}
+}
diff --git a/src/ConfigurationInterface.php b/src/ConfigurationInterface.php
@@ -5,4 +5,4 @@
 interface ConfigurationInterface
 {
     public function configureServiceManager(ServiceManager $serviceManager);
-}
+}
diff --git a/src/Di/DiInstanceManagerProxy.php b/src/Di/DiInstanceManagerProxy.php
@@ -48,4 +48,4 @@ public function getSharedInstance($classOrAlias)
             return $this->diInstanceManager->getSharedInstance($classOrAlias);
         }
     }
-}
+}
diff --git a/src/FactoryInterface.php b/src/FactoryInterface.php
@@ -5,4 +5,4 @@
 interface FactoryInterface
 {
     public function createService(ServiceLocatorInterface $serviceLocator);
-}
+}
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
@@ -5,4 +5,4 @@
 interface InitializerInterface
 {
     public function initialize($instance);
-}
+}
diff --git a/src/ServiceLocatorInterface.php b/src/ServiceLocatorInterface.php
@@ -6,4 +6,4 @@ interface ServiceLocatorInterface
 {
     public function get($name);
     public function has($name);
-}
+}
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -505,4 +505,4 @@ protected function createServiceViaCallback($callable, $cName, $rName)
         return $instance;
     }
 
-}
+}
diff --git a/test/TestAsset/Foo.php b/test/TestAsset/Foo.php
@@ -5,4 +5,4 @@
 class Foo
 {
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ interface AbstractFactoryInterface @@
     {
         public function canCreateServiceWithName($name /*, $requestedName */);
         public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name /*, $requestedName */);
-    }
+    }