Merge pull request #109 from mlapkin/master

Replace `zend-code` with `laminas-code`
goetas-webservices · Feb 21, 2020 · 4e7d185 · 4e7d185
2 parents b8c1bf1 + 4a996dc
commit 4e7d185
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "symfony/config": "^2.2|^3.0|^4.0|^5.0",
     "goetas-webservices/xsd-reader": "^0.2.8|^0.3.5",
     "doctrine/inflector": "^1.0",
-    "zendframework/zend-code": "^3.3.2",
+    "laminas/laminas-code": "^3.3.2",
 
     "psr/log": "^1.0"
   },

diff --git a/src/Php/ClassGenerator.php b/src/Php/ClassGenerator.php
@@ -5,14 +5,14 @@
 use GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPClass;
 use GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPClassOf;
 use GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPProperty;
-use Zend\Code\Generator;
-use Zend\Code\Generator\DocBlock\Tag\ParamTag;
-use Zend\Code\Generator\DocBlock\Tag\VarTag;
-use Zend\Code\Generator\DocBlock\Tag\ReturnTag;
-use Zend\Code\Generator\DocBlockGenerator;
-use Zend\Code\Generator\MethodGenerator;
-use Zend\Code\Generator\ParameterGenerator;
-use Zend\Code\Generator\PropertyGenerator;
+use Laminas\Code\Generator;
+use Laminas\Code\Generator\DocBlock\Tag\ParamTag;
+use Laminas\Code\Generator\DocBlock\Tag\VarTag;
+use Laminas\Code\Generator\DocBlock\Tag\ReturnTag;
+use Laminas\Code\Generator\DocBlockGenerator;
+use Laminas\Code\Generator\MethodGenerator;
+use Laminas\Code\Generator\ParameterGenerator;
+use Laminas\Code\Generator\PropertyGenerator;
 
 class ClassGenerator
 {
@@ -356,7 +356,7 @@ private function handleProperty(Generator\ClassGenerator $class, PHPProperty $pr
 
     public function generate(PHPClass $type)
     {
-        $class = new \Zend\Code\Generator\ClassGenerator();
+        $class = new \Laminas\Code\Generator\ClassGenerator();
         $docblock = new DocBlockGenerator("Class representing " . $type->getName());
         $docblock->setWordWrap(false);
         if ($type->getDoc()) {

diff --git a/src/Php/PathGenerator/PathGenerator.php b/src/Php/PathGenerator/PathGenerator.php
@@ -1,7 +1,7 @@
 <?php
 namespace GoetasWebservices\Xsd\XsdToPhp\Php\PathGenerator;
 
-use Zend\Code\Generator\ClassGenerator;
+use Laminas\Code\Generator\ClassGenerator;
 
 interface PathGenerator
 {

diff --git a/src/Php/PathGenerator/Psr4PathGenerator.php b/src/Php/PathGenerator/Psr4PathGenerator.php
@@ -3,7 +3,7 @@
 
 use GoetasWebservices\Xsd\XsdToPhp\PathGenerator\PathGeneratorException;
 use GoetasWebservices\Xsd\XsdToPhp\PathGenerator\Psr4PathGenerator as Psr4PathGeneratorBase;
-use Zend\Code\Generator\ClassGenerator;
+use Laminas\Code\Generator\ClassGenerator;
 
 class Psr4PathGenerator extends Psr4PathGeneratorBase implements PathGenerator
 {

diff --git a/src/Writer/PHPClassWriter.php b/src/Writer/PHPClassWriter.php
@@ -7,7 +7,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Zend\Code\Generator\FileGenerator;
+use Laminas\Code\Generator\FileGenerator;
 
 class PHPClassWriter implements LoggerAwareInterface
 {

diff --git a/tests/PHP/AnyTypePHPConversionTest.php b/tests/PHP/AnyTypePHPConversionTest.php
@@ -44,7 +44,7 @@ protected function getYamlFiles($xml, array $types = array())
     /**
      *
      * @param mixed $xml
-     * @return \Zend\Code\Generator\ClassGenerator[]
+     * @return \Laminas\Code\Generator\ClassGenerator[]
      */
     protected function getPhpClasses($xml, array $types = array())
     {

diff --git a/tests/PHP/PHPConversionTest.php b/tests/PHP/PHPConversionTest.php
@@ -12,7 +12,7 @@ class PHPConversionTest extends \PHPUnit_Framework_TestCase
     /**
      *
      * @param mixed $xml
-     * @return \Zend\Code\Generator\ClassGenerator[]
+     * @return \Laminas\Code\Generator\ClassGenerator[]
      */
     protected function getClasses($xml)
     {

diff --git a/tests/PathGenerator/PHPPathGeneratorTest.php b/tests/PathGenerator/PHPPathGeneratorTest.php
@@ -3,7 +3,7 @@
 
 use GoetasWebservices\Xsd\XsdToPhp\Php\PathGenerator\Psr4PathGenerator;
 use GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPClass;
-use Zend\Code\Generator\ClassGenerator;
+use Laminas\Code\Generator\ClassGenerator;
 
 class PHPPathGeneratorTest extends \PHPUnit_Framework_TestCase
 {