Forward port zendframework/zendframework#3522

Conflicts: library/Zend/Code/Generator/AbstractMemberGenerator.php library/Zend/Mvc/Controller/AbstractRestfulController.php library/Zend/Soap/Client/DotNet.php
zendframework · Jan 23, 2013 · 95173ad · 95173ad
commit 95173ad
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
@@ -211,5 +211,4 @@ protected function createFromFactory($canonicalName, $requestedName)
 
         return $instance;
     }
-
 }
diff --git a/src/Config.php b/src/Config.php
@@ -146,5 +146,4 @@ public function configureServiceManager(ServiceManager $serviceManager)
             $serviceManager->setShared($name, $isShared);
         }
     }
-
 }
diff --git a/src/Di/DiServiceFactory.php b/src/Di/DiServiceFactory.php
@@ -119,5 +119,4 @@ public function get($name, array $params = array())
         }
 
     }
-
 }
diff --git a/src/Di/DiServiceInitializer.php b/src/Di/DiServiceInitializer.php
@@ -64,5 +64,4 @@ public function initialize($instance, ServiceLocatorInterface $serviceLocator)
             throw $e;
         }
     }
-
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -211,5 +211,4 @@ protected function createFromFactory($canonicalName, $requestedName)

		return $instance;
		}

		}
-Original file line number
+Diff line change
@@ Expand Up @@
                 $serviceManager->setShared($name, $isShared);
             }
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,5 +119,4 @@ public function get($name, array $params = array())
		}

		}

		}