Skip to content

Commit 4413c7a

Browse files
committed
ref
1 parent ee6d93f commit 4413c7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1067
-2148
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
composer.lock
44
soap
55
/.phpunit.result.cache
6+
tmp
7+
.phpcs-cache
8+
config.yml

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ git:
88
depth: 1
99

1010
php:
11-
- 7.1
1211
- 7.2
1312
- 7.3
1413
- 7.4
1514

1615
matrix:
1716
include:
18-
- php: 7.1
17+
- php: 7.2
1918
env:
2019
- COVERAGE=true
2120
- COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
@@ -35,4 +34,4 @@ script:
3534
after_success:
3635
- wget https://scrutinizer-ci.com/ocular.phar
3736
- if [ $COVERAGE ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
38-
37+

composer.json

+39-12
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,52 @@
1111
"php": "^7.1",
1212

1313
"psr/http-message": "^1.0",
14-
"php-http/httplug": "^1.0|^2.0",
15-
"php-http/discovery": "^1.0",
16-
"php-http/message-factory": "^1.0.2",
17-
"symfony/dependency-injection": "^2.4|^3.0|^4.0",
18-
14+
"psr/http-factory": "^1.0",
15+
"psr/http-client": "^1.0",
16+
"php-http/discovery": "^1.6",
17+
"symfony/dependency-injection": "^2.4|^3.0|^4.0|^5.0",
1918
"doctrine/instantiator": "^1.0.3",
2019

21-
"goetas-webservices/xsd2php-runtime": "^0.2.2",
22-
"jms/serializer": "^1.6|^2.0|^3.0"
20+
"goetas-webservices/xsd2php-runtime": "^0.2.11",
21+
"jms/serializer": "^1.6|^2.0|^3.0",
22+
"goetas-webservices/soap-common": "@dev"
23+
24+
2325
},
2426
"require-dev": {
2527
"phpunit/phpunit": "^7.0|^8.0",
2628

27-
"goetas-webservices/wsdl2php": "^0.4",
28-
"goetas-webservices/wsdl-reader": "^0.3.1",
29+
"goetas-webservices/xsd2php": "^0.4.0@dev",
30+
"goetas-webservices/wsdl2php": "^v0.4.4@dev",
2931

30-
"php-http/guzzle6-adapter": "^1.0|^2.0",
31-
"php-http/message": "^1.0"
32+
"goetas-webservices/wsdl-reader": "^0.3.1@dev",
33+
"goetas-webservices/soap-reader": "@dev",
34+
"laminas/laminas-diactoros": "^2.5",
35+
"guzzlehttp/guzzle": "^7.2",
36+
"doctrine/coding-standard": "^8.1"
3237
},
38+
"repositories": [
39+
{
40+
"type": "path",
41+
"url": "/home/goetas/projects/soap-server/soap-metadata",
42+
"symlink": true
43+
},
44+
{
45+
"type": "path",
46+
"url": "/home/goetas/projects/soap-server/vendor/goetas-webservices/soap-reader",
47+
"symlink": true
48+
},
49+
{
50+
"type": "path",
51+
"url": "/home/goetas/projects/soap-server/vendor/goetas-webservices/wsdl2php",
52+
"symlink": true
53+
},
54+
{
55+
"type": "path",
56+
"url": "/home/goetas/projects/soap-server/vendor/goetas-webservices/xsd2php",
57+
"symlink": true
58+
}
59+
],
3360
"autoload": {
3461
"psr-4": {
3562
"GoetasWebservices\\SoapServices\\SoapClient\\": "src"
@@ -44,7 +71,7 @@
4471
},
4572
"extra": {
4673
"branch-alias": {
47-
"dev-master": "0.2-dev"
74+
"dev-master": "0.3-dev"
4875
}
4976
},
5077
"bin": [

phpcs.xml.dist

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<?xml version="1.0"?>
2+
<ruleset
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
5+
>
6+
<!-- <arg name="basepath" value="."/>-->
7+
<arg name="extensions" value="php"/>
8+
<arg name="parallel" value="80"/>
9+
<arg name="cache" value=".phpcs-cache"/>
10+
<arg name="colors"/>
11+
<arg value="nps"/>
12+
13+
<file>src/</file>
14+
<file>tests/</file>
15+
<file>/home/goetas/projects/soap-server/soap-metadata</file>
16+
<exclude-pattern>*/tmp/*</exclude-pattern>
17+
18+
<rule ref="Doctrine">
19+
<exclude name="Generic.Formatting.SpaceAfterNot"/>
20+
<exclude name="Generic.Formatting.MultipleStatementAlignment"/>
21+
22+
<exclude name="Squiz.Arrays.ArrayDeclaration.KeySpecified"/>
23+
<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
24+
25+
<exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
26+
<exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
27+
<exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
28+
<exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming.SuperfluousSuffix"/>
29+
30+
<exclude name="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison.DisallowedYodaComparison"/>
31+
<exclude name="SlevomatCodingStandard.ControlStructures.AssignmentInCondition.AssignmentInCondition"/>
32+
<exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
33+
34+
<exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
35+
36+
</rule>
37+
38+
<rule ref="SlevomatCodingStandard.ControlStructures.RequireYodaComparison"/>
39+
40+
<rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
41+
<properties>
42+
<property
43+
name="forbiddenAnnotations"
44+
type="array"
45+
value="
46+
@api,
47+
@category,
48+
@copyright,
49+
@created,
50+
@license,
51+
@package,
52+
@since,
53+
@subpackage,
54+
@version
55+
"
56+
/>
57+
</properties>
58+
</rule>
59+
60+
61+
<rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
62+
<properties>
63+
<property name="allowFallbackGlobalConstants" type="boolean" value="true"/>
64+
<property name="allowFallbackGlobalFunctions" type="boolean" value="true"/>
65+
<property name="allowFullyQualifiedGlobalClasses" type="boolean" value="true"/>
66+
<property name="allowFullyQualifiedGlobalConstants" type="boolean" value="true"/>
67+
<property name="allowFullyQualifiedGlobalFunctions" type="boolean" value="true"/>
68+
<property name="allowFullyQualifiedNameForCollidingClasses" type="boolean" value="false"/>
69+
<property name="allowFullyQualifiedNameForCollidingConstants" type="boolean" value="false"/>
70+
<property name="allowFullyQualifiedNameForCollidingFunctions" type="boolean" value="false"/>
71+
<property name="searchAnnotations" type="boolean" value="true"/>
72+
</properties>
73+
</rule>
74+
75+
76+
<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
77+
<exclude-pattern>tests/*</exclude-pattern>
78+
</rule>
79+
80+
<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements">
81+
<exclude-pattern>tests/*</exclude-pattern>
82+
</rule>
83+
84+
<rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
85+
<properties>
86+
<property name="annotationsGroups" type="array">
87+
<element value="
88+
@Annotation,
89+
@Target,
90+
"/>
91+
<element value="
92+
@internal,
93+
@deprecated,
94+
"/>
95+
<element value="@author"/>
96+
<element value="
97+
@link,
98+
@see,
99+
@uses,
100+
"/>
101+
<element value="
102+
@Serializer\,
103+
@ORM\,
104+
@ODM\,
105+
"/>
106+
<element value="@param"/>
107+
<element value="@return"/>
108+
<element value="@throws"/>
109+
</property>
110+
</properties>
111+
</rule>
112+
113+
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
114+
<!-- This sniff will only remove useless @return -->
115+
116+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>-->
117+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint"/>-->
118+
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
119+
<exclude-pattern>/home/goetas/projects/soap-server/soap-metadata/src/Envelope/*</exclude-pattern>
120+
</rule>
121+
122+
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
123+
<!-- This sniff will only remove useless @var -->
124+
125+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>-->
126+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint"/>-->
127+
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
128+
<exclude-pattern>/home/goetas/projects/soap-server/soap-metadata/src/Envelope/*</exclude-pattern>
129+
</rule>
130+
131+
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
132+
<!-- This sniff will only remove useless @param -->
133+
134+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>-->
135+
<!-- <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint"/>-->
136+
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
137+
138+
<exclude-pattern>/home/goetas/projects/soap-server/soap-metadata/src/Envelope/*</exclude-pattern>
139+
</rule>
140+
</ruleset>

phpunit.xml.dist

+8-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
</testsuite>
2323
</testsuites>
2424

25-
<filter>
26-
<whitelist>
27-
<directory>src</directory>
28-
</whitelist>
29-
</filter>
25+
<filter>
26+
<whitelist>
27+
<directory>src</directory>
28+
<directory>soap-metadata/src</directory>
29+
<directory>vendor/goetas-webservices/soap-common</directory>
30+
<directory>../soap-metadata/src</directory>
31+
</whitelist>
32+
</filter>
3033

3134
</phpunit>
3235

src/Arguments/ArgumentsReader.php

-132
This file was deleted.

0 commit comments

Comments
 (0)