Merge branch 'release/1.0.0rc01'

Author: mikaelcom

.php_cs

@@ -0,0 +1,10 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->exclude('vendor')
+    ->exclude('Tests/resources')
+    ->in(__DIR__);
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->finder($finder);

.travis.yml

@@ -12,4 +12,11 @@ before_install:
     - composer self-update
 
 install:
-    - composer install
+    - composer install --no-dev
+
+script:
+    - phpunit --coverage-text --coverage-clover=coverage.clover
+
+after_script:
+    - wget https://scrutinizer-ci.com/ocular.phar
+    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

CASES.md

@@ -1,6 +1,6 @@
 Test case examples. This list is not exhaustive nor perfect, it has been gathered in the time and can be used as a starting point.
 
-- "Full" documentation (functions, structs, enumerations, values) with "virual" structs inheritance documentation :
+- "Full" documentation (functions, structs, enumerations, values) with "virtual" structs inheritance documentation :
     - http://developer.ebay.com/webservices/latest/ebaySvc.wsdl
     - https://www.paypalobjects.com/wsdl/PayPalSvc.wsdl
     - http://queue.amazonaws.com/doc/2012-11-05/QueueService.wsdl
@@ -15,6 +15,7 @@ Test case examples. This list is not exhaustive nor perfect, it has been gathere
     - http://api.fromdoppler.com/Default.asmx?WSDL
     - https://webapi.aukro.cz/uploader.php?wsdl
     - https://www.paypalobjects.com/wsdl/PayPalSvc.wsdl
+    - https://api5.successfactors.eu/sfapi/v1/soap12?wsdl
 
 - Simple function parameter (not a struct) :
     - http://traveltek-importer.planetcruiseluxury.co.uk/region.wsdl

CHANGELOG.md

@@ -1,23 +1,46 @@
 CHANGELOG
 =========
 
+1.0.0RC01
+---------
+- First major release candidate version
+    - Deep refactoring of all old original classes
+    - Performance optimizations
+    - Usage of [PhpGenerator](https://github.com/WsdlToPhp/PhpGenerator) package for any generated PHP file
+    - Namespace support
+    - Composer usage for 
+    - Externalization of main classes from which any Struct/Array/Service generated class
+    - auto-generation sample.php file renamed to tutorial.php
+    - Usage of [PackageBase](https://github.com/WsdlToPhp/PackageBase) package
+    - Enhancements and consolidations on generated Struct classes:
+        - Fluidity
+        - Less annotations
+        - Properties are all well retrieved
+    - Options removal for simplifications:
+        - SendArrayAsParameter,
+        - SendParametersAsArray,
+        - GenerateAutoload,
+        - GenerateWsdlClass,
+        - SubCategory,
+        - InheritsClassIdentifier 
+
 0.0.5
 -----
-# Fix unit tests according to previous changes
+- Fix unit tests according to previous changes
 
 0.0.4
 -----
-#9 - Leading zero not taken into account in enumeration classes
-#10 - --wsdl-genautoload=false also controls creation of sample.php file (console mode)
+- issue #9 - Leading zero not taken into account in enumeration classes
+- 10 - --wsdl-genautoload=false also controls creation of sample.php file (console mode)
 
 0.0.3
 -----
-#7 - PHP warning on str_repeat()
+- 7 - PHP warning on str_repeat()
 
 0.0.2
 -----
-Create tag with correct composer.json file
+- Create tag with correct composer.json file
 
 0.0.1
 -----
-Initial version created from original project WsdlToPhp.
+- Initial version created from original project WsdlToPhp.

Command/AbstractCommand.php

@@ -9,14 +9,25 @@
 
 abstract class AbstractCommand extends Command
 {
-    const
-        EXIT_OK     = 1,
-        EXIT_NOT_OK = 0;
-
-    protected
-        $input,
-        $output;
-
+    /**
+     * @var int
+     */
+    const EXIT_OK     = 1;
+    /**
+     * @var int
+     */
+    const EXIT_NOT_OK = 0;
+    /**
+     * @var InputInterface
+     */
+    protected $input;
+    /**
+     * @var OutputInterface
+     */
+    protected $output;
+    /**
+     * @see \Symfony\Component\Console\Command\Command::configure()
+     */
     protected function configure()
     {
         $this
@@ -27,19 +38,26 @@ protected function configure()
                 'If true, then package is really generated otherwise debug informations are displayed'
             );
     }
-
+    /**
+     * @see \Symfony\Component\Console\Command\Command::execute()
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->input  = $input;
         $this->output = $output;
         return self::EXIT_OK;
     }
-
+    /**
+     * @return bool
+     */
     protected function canExecute()
     {
         return (bool)$this->input->getOption('force') === true;
     }
-
+    /**
+     * @param string|array $messages
+     * @param int $type
+     */
     protected function writeLn($messages, $type = OutputInterface::OUTPUT_NORMAL)
     {
         $this->output->writeln($messages, $type);

Command/GeneratePackageCommand.php

@@ -13,15 +13,13 @@ class GeneratePackageCommand extends AbstractCommand
      * @var Generator
      */
     protected $generator;
-
     /**
      * @return Generator
      */
     public function getGenerator()
     {
         return $this->generator;
     }
-
     /**
      * @param Generator $generator
      * @return GeneratePackageCommand
@@ -31,7 +29,6 @@ protected function setGenerator(Generator $generator)
         $this->generator = $generator;
         return $this;
     }
-
     /**
      * @param string $wsdlUrl
      * @param string $wsdlLogin
@@ -41,9 +38,8 @@ protected function setGenerator(Generator $generator)
      */
     protected function getInstanceOfGenerator($wsdlUrl, $wsdlLogin = null, $wsdlPassword = null, array $wsdlOptions = array())
     {
-        return Generator::instance($wsdlUrl, $wsdlLogin, $wsdlPassword, $wsdlOptions);
+        return new Generator($wsdlUrl, $wsdlLogin, $wsdlPassword, $wsdlOptions);
     }
-
     /**
      * @see \WsdlToPhp\PackageGenerator\Command\AbstractCommand::configure()
      */
@@ -64,19 +60,12 @@ protected function configure()
             ->addOption('wsdl-prefix', null, InputOption::VALUE_REQUIRED, 'Prepend generated classes')
             ->addOption('wsdl-namespace', null, InputOption::VALUE_OPTIONAL, 'Package classes\' namespace')
             ->addOption('wsdl-category', null, InputOption::VALUE_OPTIONAL, 'First level directory name generation mode (start, end, cat, none)')
-            ->addOption('wsdl-subcategory', null, InputOption::VALUE_OPTIONAL, 'Second level directory name generation mode (start, end, none), disabled if category=cat')
             ->addOption('wsdl-gathermethods', null, InputOption::VALUE_OPTIONAL, 'Gather methods based on operation name mode (start, end)')
-            ->addOption('wsdl-genwsdlclass', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable main Wsdl class generation, you should always enable this option')
             ->addOption('wsdl-gentutorial', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable tutorial file, you should enable this option only on dev')
-            ->addOption('wsdl-genautoload', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable autoload file generation, this is useless if you use composer or your own autoloader')
-            ->addOption('wsdl-sendarrayparam', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable usage of an array to send the parameters, can be disabled as it will soon removed')
             ->addOption('wsdl-genericconstants', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable usage of generic constants name (ex : ENUM_VALUE_0, ENUM_VALUE_1, etc) or contextual values (ex : VALUE_STRING, VALUE_YES, VALUES_NO, etc)')
-            ->addOption('wsdl-reponseasobj', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable usage of object to encapsulate Web Service response')
-            ->addOption('wsdl-inherits', null, InputOption::VALUE_OPTIONAL, 'Astracts struct base name to identify abtract structs, can be avoided as it will be soon removed')
-            ->addOption('wsdl-paramsasarray', null, InputOption::VALUE_OPTIONAL, 'Enable/Disable usage of a \'parameters\' parameter in an array to contain request parameters, disabled in most cases')
-            ->addOption('wsdl-addcomments', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'Set comments to be used within each generated file');
+            ->addOption('wsdl-addcomments', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'Set comments to be used within each generated file')
+            ->addOption('wsdl-standalone', null, InputOption::VALUE_OPTIONAL, 'By default, the generated package can be used as a standalone. Otherwise, you must add wsdltophp/packagebase:dev-master to your main composer.json.');
     }
-
     /**
      * @see \Sdc\AppBundle\Command\Command::execute()
      */
@@ -86,12 +75,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $start = new \DateTime();
         $this->writeLn(sprintf(" Start at %s", $start->format('Y-m-d H:i:s')));
 
-        $wsdlUrl            = $this->input->getOption('wsdl-urlorpath');
-        $wsdlLogin          = $this->input->getOption('wsdl-login');
-        $wsdlPassword       = $this->input->getOption('wsdl-password');
-        $packageName        = $this->input->getOption('wsdl-prefix');
+        $wsdlUrl = $this->input->getOption('wsdl-urlorpath');
+        $wsdlLogin = $this->input->getOption('wsdl-login');
+        $wsdlPassword = $this->input->getOption('wsdl-password');
+        $packageName = $this->input->getOption('wsdl-prefix');
         $packageDestination = $this->input->getOption('wsdl-destination');
-        $wsdlOptions        = $this->defineWsdlOptions();
+        $wsdlOptions = $this->defineWsdlOptions();
 
         $this->setGenerator($this->getInstanceOfGenerator($wsdlUrl, $wsdlLogin, $wsdlPassword, $wsdlOptions));
 
@@ -103,9 +92,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->writeLn("  Generation not launched, use --force to force generation");
             $this->writeLn("  Wsdl used:");
             $this->writeLn("    " . implode(PHP_EOL . '    ', $this->formatArrayForConsole(array(
-                'url'          => $wsdlUrl,
-                'login'        => $wsdlLogin,
-                'password'     => $wsdlPassword,
+                'url' => $wsdlUrl,
+                'login' => $wsdlLogin,
+                'password' => $wsdlPassword,
                 'Package name' => $packageName,
                 'Package dest' => $packageDestination,
             ))));
@@ -118,17 +107,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $end = new \DateTime();
         $this->writeLn(sprintf(" End at %s, duration: %s", $end->format('Y-m-d H:i:s'), $start->diff($end)->format('%H:%I:%S')));
     }
-
     /**
      * @return array
      */
     protected function defineWsdlOptions()
     {
-        $options        = array();
-        $wsdlProxyHost  = $this->input->getOption('wsdl-proxy-host');
-        $wsdlProxyPort  = $this->input->getOption('wsdl-proxy-port');
+        $options = array();
+        $wsdlProxyHost = $this->input->getOption('wsdl-proxy-host');
+        $wsdlProxyPort = $this->input->getOption('wsdl-proxy-port');
         $wsdlProxyLogin = $this->input->getOption('wsdl-proxy-login');
-        $wsdlProxyPass  = $this->input->getOption('wsdl-proxy-password');
+        $wsdlProxyPass = $this->input->getOption('wsdl-proxy-password');
 
         if (!empty($wsdlProxyHost)) {
             $options['proxy_host'] = $wsdlProxyHost;
@@ -145,29 +133,21 @@ protected function defineWsdlOptions()
 
         return $options;
     }
-
     /**
      * @return array
      */
     protected function getPackageGenerationCommandLineOptions()
     {
         return array(
-            'wsdl-namespace'        => 'Namespace',
-            'wsdl-category'         => 'Category',
-            'wsdl-subcategory'      => 'SubCategory',
-            'wsdl-gathermethods'    => 'GatherMethods',
-            'wsdl-genwsdlclass'     => 'GenerateWsdlClassFile',
-            'wsdl-gentutorial'      => 'GenerateTutorialFile',
-            'wsdl-genautoload'      => 'GenerateAutoloadFile',
-            'wsdl-sendarrayparam'   => 'SendArrayAsParameter',
+            'wsdl-namespace' => 'NamespacePrefix',
+            'wsdl-category' => 'Category',
+            'wsdl-gathermethods' => 'GatherMethods',
+            'wsdl-gentutorial' => 'GenerateTutorialFile',
             'wsdl-genericconstants' => 'GenericConstantsNames',
-            'wsdl-reponseasobj'     => 'GetResponseAsWsdlObject',
-            'wsdl-inherits'         => 'InheritsClassIdentifier',
-            'wsdl-paramsasarray'    => 'SendParametersAsArray',
-            'wsdl-addcomments'      => 'AddComments',
+            'wsdl-addcomments' => 'AddComments',
+            'wsdl-standalone' => 'Standalone',
         );
     }
-
     /**
      * @return array
      */
@@ -193,7 +173,6 @@ protected function definePackageGenerationOptions()
         }
         return $options;
     }
-
     /**
      * @param mixed $optionValue
      * @return boolean|mixed

ConfigurationReader/AbstractYamlReader.php

@@ -38,12 +38,10 @@ public static function instance($filename = null)
         if (empty($filename) || !is_file($filename)) {
             throw new \InvalidArgumentException(sprintf('Unable to locate file "%s"', $filename));
         }
-
         $key = sprintf('%s_%s', get_called_class(), $filename);
         if (!isset(self::$instances[$key])) {
             self::$instances[$key] = new static($filename);
         }
-
         return self::$instances[$key];
     }
 }