Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…

…-cleanup'
zendframework · Jan 4, 2014 · 38be842 · 38be842
commit 38be842
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -12,8 +12,6 @@
 use Zend\Server\Reflection;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
-use Zend\Soap\Exception;
-use Zend\Soap\Wsdl;
 use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
 use Zend\Uri;
 

diff --git a/test/Wsdl/CompositeStrategyTest.php b/test/Wsdl/CompositeStrategyTest.php
@@ -7,20 +7,16 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Soap\Wsdl\ComplexTypeStrategy;
+namespace ZendTest\Soap\Wsdl;
 
 use Zend\Soap\Wsdl\ComplexTypeStrategy;
-use Zend\Soap\Wsdl;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\AnyType;
 use Zend\Soap\Wsdl\ComplexTypeStrategy\Composite;
 use Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex;
 use Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeSequence;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\DefaultComplexType;
 use ZendTest\Soap\WsdlTestHelper;
 
-
-
-/** Zend_Soap_Wsdl */
-
-
 /**
  * @group      Zend_Soap
  * @group      Zend_Soap_Wsdl
@@ -35,8 +31,8 @@ public function setUp()
 
     public function testCompositeApiAddingStragiesToTypes()
     {
-        $strategy = new Composite(array(), new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeSequence);
-        $strategy->connectTypeToStrategy('Book', new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex);
+        $strategy = new Composite(array(), new ArrayOfTypeSequence);
+        $strategy->connectTypeToStrategy('Book', new ArrayOfTypeComplex);
 
         $bookStrategy = $strategy->getStrategyOfType('Book');
         $cookieStrategy = $strategy->getStrategyOfType('Cookie');
@@ -50,7 +46,7 @@ public function testConstructorTypeMapSyntax()
         $typeMap = array('Book' => '\Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex');
 
         $strategy = new ComplexTypeStrategy\Composite($typeMap,
-            new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeSequence
+            new ArrayOfTypeSequence
         );
 
         $bookStrategy = $strategy->getStrategyOfType('Book');
@@ -94,12 +90,12 @@ public function testCompositeThrowsExceptionOnInvalidStrategyPart2()
 
     public function testCompositeDelegatesAddingComplexTypesToSubStrategies()
     {
-        $this->strategy = new ComplexTypeStrategy\Composite(array(), new \Zend\Soap\Wsdl\ComplexTypeStrategy\AnyType);
+        $this->strategy = new ComplexTypeStrategy\Composite(array(), new AnyType);
         $this->strategy->connectTypeToStrategy('\ZendTest\Soap\TestAsset\Book',
-            new \Zend\Soap\Wsdl\ComplexTypeStrategy\ArrayOfTypeComplex
+            new ArrayOfTypeComplex
         );
         $this->strategy->connectTypeToStrategy('\ZendTest\Soap\TestAsset\Cookie',
-            new \Zend\Soap\Wsdl\ComplexTypeStrategy\DefaultComplexType
+            new DefaultComplexType
         );
 
         parent::setUp();