WSDL Generation rewrite (with new tests also) as a base for future changes. #3919

GrzegorzDrozd · 2013-02-28T00:30:34Z

Hello.

Serious Rewrite of WSDL generation from strings and simple DOM to full object oriented from the begining. This is a base for more changes like: multiple faults, missing xsd types etc.
It uses dom and proper namespaces. All tests are also rewritten to new structure and now are using xpath versus old string comparison.
Code formating in accordance with Coding Style.
More tests.
Integration of recent code changes introduced among others by ayastreb and weierophinney.
Even more tests and test data.

I checked current test output wsdl files against new xpath rules and everything was in green. I also checked new wsdl files against old tests.

I have more patches almost ready and all of them are based on this rewrite.

This is my first pull request so if I did something wrong please let me know so I can fix it.

Best regards.

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/Server/DocumentLiteralWrapperTest.php tests/Zend/Soap/WsdlTest.php

Complete rewrite of wsdl generation from strings and simple dom to full object oriented from the begining. It uses dom and proper namespaces. All tests are also rewritten to new structure and now are using xpath versus old string comparison.

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/WsdlTest.php

When runing clean from command line one test was failing. Fixed.

Code formating in accordance with Coding Style. More tests. Integration of recent code changes from ayastreb and weierophinney. Even more tests and test data.

Maks3w · 2013-02-28T09:10:10Z

Your commits cannot be merged because are in conflict with the actual master branch. For fix this merge the most recent version of master in your PR branch.

Also it's a good thing make your commits in a specific branch rather than master or develop. See this article for to see how to do this http://blog.evan.pro/keeping-a-clean-github-fork-part-1

Finally some files has now different chmod rigts (00644 > 00755) please restore the original chmod rights

Maks3w · 2013-02-28T09:11:40Z

library/Zend/Soap/Wsdl.php

-     * @param array $input An array of attributes for the input element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
-     * @param array $output An array of attributes for the output element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
-     * @param array $fault An array of attributes for the fault element, allowed keys are: 'name', 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
+	 * @param string $name


Check this kind of indentations along all the PR

Fixed files permissions

Maks3w · 2013-02-28T09:45:38Z

library/Zend/Soap/AutoDiscover.php

-    public function __construct(ComplexTypeStrategy $strategy = null, $endpointUri=null, $wsdlClass=null, array $classMap = array())
-    {
+    public function __construct(ComplexTypeStrategy $strategy = null,
+        $endpointUri=null, $wsdlClass=null, array $classMap = array()


According PSR-2 guidelines when the arguments line is splitted must be only one argument by line

https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md#44-method-arguments

So PSR-2 is now standard for Zend Framework ? Because in coding standard there is no info about one argument per line: http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards#CodingStandards-FunctionandMethodDeclaration

Yes, PSR-2 is the statndard for ZF2

Maks3w · 2013-02-28T10:01:06Z

library/Zend/Soap/Server.php

                case 'featues':
-                    trigger_error(__METHOD__ . ': the option "featues" is deprecated as of 1.10.x and will be removed with 2.0.0; use "features" instead', E_USER_NOTICE);
+                    trigger_error(__METHOD__ . ': the option "featues" is deprecated'.


You can remove case

GrzegorzDrozd · 2013-02-28T10:02:12Z

I just committed merge with master and file permission fix.

Maks3w · 2013-02-28T10:03:12Z

library/Zend/Soap/Server.php

@@ -329,6 +357,7 @@ public function setActor($actor)
    {
        $this->validateUrn($actor);
        $this->actor = $actor;
+
        return $this;
    }



Please restore the return type

Do you mean change from @return bool to @return true ? But TRUE is not valid data type. Maybe I should change is to : "@return bool always true or throws exception when error."

true is a valid phpDoc type. A different thing is that some IDE's doesn't support it

Are you sure?
http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_tags.return.pkg.html
States: "The datatype should be a valid PHP type (int, string, bool, etc), a class name for the type of object returned, or simply "mixed". "

Sure http://www.phpdoc.org/docs/latest/for-users/phpdoc/types.html

Thank you for a link :) I did not know that phpdoc and phpdocumentator differ about that.

…ting changes.

GrzegorzDrozd · 2013-02-28T13:08:48Z

Code is reformatted according to Your suggestions: multi-line arguments and more loose line length (only when line length excess 120 chars new line is introduced.

Maybe it is time to change guide for contributors? It still points to outdated code style rules?

I don't know how to move commits to other branch. Is this necessary? My next PR are in separate branches, only this one is on master because I started to work on it so long ago.

weierophinney · 2013-04-15T15:36:20Z

library/Zend/Soap/Server.php

            return;
        }

        // Echo the response, if we're not returning it
        if (!$this->returnResponse) {
            echo $this->response;
+
            return;


Remove the blank preceding line.

weierophinney · 2013-04-15T16:01:58Z

@GrzegorzDrozd This looks like an EXCELLENT addition. I made a ton of comments, but there are some general ones I want to point out:

The accepted order for params/return/throws annotations is exactly that: params, return, throws. Additionally, there should be no empty lines between them.
You introduce a lot of empty lines that are largely unnecessary -- particularly when introduced between lines in a method or block with 5 lines or fewer to begin with. These can be removed.
We prefer protected visibility over private unless there are very compelling reasons for the stricter visibility. If you have such reasons, please document them.
$foo instanceof SomeClass is the same as is_object($foo) && is_subclass_of($foo, 'SomeClass') -- but is faster and more readable. :)
For classes referenced by docblock, the preferred practice is to use imports and/or names relative to the current namespace; add imports if none already exist. An import statement is a no-op if the code never references the class (and even a no-op in instanceof checks!), so they're cheap, and aid in readability. (Plus, phpdoc and most IDEs will expand based on imports and current namespace already!)

Finally, make sure you rebase, as master has diverged from when you created the original work.

Thanks in advance -- again, looks EXCELLENT!

GrzegorzDrozd · 2013-04-16T11:57:30Z

Thank you for your appreciation :)

I'll fix the code and apply your comments. But due to lack of time, I might not finish before the weekend. Or even next weekend. :( I will try to do my best.

WSDL Generation rewrite (with new tests also) as a base for future changes. Conflicts: library/Zend/Soap/AutoDiscover.php library/Zend/Soap/Client/DotNet.php library/Zend/Soap/Server.php library/Zend/Soap/Server/DocumentLiteralWrapper.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php tests/ZendTest/Soap/Wsdl/CompositeStrategyTest.php

- Ensure params/return/throws annotations are in correct order, with no whitespace between. - Remove unnecessary empty lines. - Ensure properties are in alphabetical order. - Ensure classes referenced in docblocks are imported and/or resolved from current namespace.

- instead of is_object() && is_subclass_of()

- per php-cs-fixer

Close #3919

weierophinney · 2013-04-30T16:47:00Z

Merged to develop for release with 2.2.0 -- thanks, @GrzegorzDrozd ! (I made the changes requested on merge)

GrzegorzDrozd · 2013-04-30T18:01:04Z

Thank you! :) I have deadline on my project so I planned to take care of Your feedback during this, 5 day (at least in Poland ;) ) weekend. Sorry for extra work which You had to do.

ps. batch of next improvements coming soon :) This time smaller ;)

…d/master WSDL Generation rewrite (with new tests also) as a base for future changes. Conflicts: library/Zend/Soap/AutoDiscover.php library/Zend/Soap/Client/DotNet.php library/Zend/Soap/Server.php library/Zend/Soap/Server/DocumentLiteralWrapper.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php tests/ZendTest/Soap/Wsdl/CompositeStrategyTest.php

- Ensure params/return/throws annotations are in correct order, with no whitespace between. - Remove unnecessary empty lines. - Ensure properties are in alphabetical order. - Ensure classes referenced in docblocks are imported and/or resolved from current namespace.

- instead of is_object() && is_subclass_of()

…ibility

- per php-cs-fixer

Close zendframework/zendframework#3919

Grzegorz Drozd and others added 11 commits October 11, 2012 12:02

Changes in a way that WSDL is generated - dom and objects.

6306a57

More DOM

f0be02a

Merge remote-tracking branch 'upstream/master'

8476ba1

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/Server/DocumentLiteralWrapperTest.php tests/Zend/Soap/WsdlTest.php

Fixes in wsdl generation and tests.

f2e03de

More code changes

73efbc2

Old files removed

ab0e58b

Complete rewrite of wsdl generation.

e37b943

Complete rewrite of wsdl generation from strings and simple dom to full object oriented from the begining. It uses dom and proper namespaces. All tests are also rewritten to new structure and now are using xpath versus old string comparison.

Merge branch 'master' of github.com:GrzegorzDrozd/zf2

4392452

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/WsdlTest.php

Quick fix in test.

b784880

When runing clean from command line one test was failing. Fixed.

Further improvements to the code.

b84e979

Code formating in accordance with Coding Style. More tests. Integration of recent code changes from ayastreb and weierophinney. Even more tests and test data.

Missing tests for DotNet client.

a6edf8b

Maks3w reviewed Feb 28, 2013
View reviewed changes

Merge branch 'master' of git://github.com/zendframework/zf2

f9affd1

Fixed files permissions

Maks3w reviewed Feb 28, 2013
View reviewed changes

Another permission fix.

0a4cfc0

Maks3w reviewed Feb 28, 2013
View reviewed changes

Grzegorz Drozd added 3 commits February 28, 2013 11:34

First part of changes acording to code rewiev. Mostly style and forma…

cbc5042

…ting changes.

Final code reformat acording to code review.

a387e8f

Damm you file permissions :/. Another fix.

bbc6a02

weierophinney reviewed Apr 15, 2013
View reviewed changes

ghost assigned weierophinney Apr 15, 2013

weierophinney added a commit that referenced this pull request Apr 30, 2013

[#3919] Use instanceof

72b5d5f

- instead of is_object() && is_subclass_of()

weierophinney added a commit that referenced this pull request Apr 30, 2013

[#3919] Replace private with protected visibility

1238016

weierophinney added a commit that referenced this pull request Apr 30, 2013

[#3919] CS fixes

1eec4da

- per php-cs-fixer

weierophinney added a commit that referenced this pull request Apr 30, 2013

Merge branch 'feature/3919' into develop

946c4d9

Close #3919

weierophinney closed this Apr 30, 2013

weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

[zendframework/zendframework#3919] Use instanceof

57b865c

- instead of is_object() && is_subclass_of()

weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

[zendframework/zendframework#3919] Replace private with protected vis…

951b6e5

…ibility

weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

[zendframework/zendframework#3919] CS fixes

427505a

- per php-cs-fixer

weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

Merge branch 'feature/3919' into develop

5abe4b0

Close zendframework/zendframework#3919

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WSDL Generation rewrite (with new tests also) as a base for future changes. #3919

WSDL Generation rewrite (with new tests also) as a base for future changes. #3919

GrzegorzDrozd commented Feb 28, 2013

Maks3w commented Feb 28, 2013

Maks3w Feb 28, 2013

Maks3w Feb 28, 2013

GrzegorzDrozd Feb 28, 2013

Maks3w Feb 28, 2013

Maks3w Feb 28, 2013

GrzegorzDrozd commented Feb 28, 2013

Maks3w Feb 28, 2013

GrzegorzDrozd Feb 28, 2013

Maks3w Feb 28, 2013

GrzegorzDrozd Feb 28, 2013

Maks3w Feb 28, 2013

GrzegorzDrozd Feb 28, 2013

GrzegorzDrozd commented Feb 28, 2013

weierophinney Apr 15, 2013

weierophinney commented Apr 15, 2013

GrzegorzDrozd commented Apr 16, 2013

weierophinney commented Apr 30, 2013

GrzegorzDrozd commented Apr 30, 2013

WSDL Generation rewrite (with new tests also) as a base for future changes. #3919

WSDL Generation rewrite (with new tests also) as a base for future changes. #3919

Conversation

GrzegorzDrozd commented Feb 28, 2013

Maks3w commented Feb 28, 2013

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GrzegorzDrozd commented Feb 28, 2013

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GrzegorzDrozd commented Feb 28, 2013

Choose a reason for hiding this comment

weierophinney commented Apr 15, 2013

GrzegorzDrozd commented Apr 16, 2013

weierophinney commented Apr 30, 2013

GrzegorzDrozd commented Apr 30, 2013