Reorganized directories structure

BeSimple · Jul 19, 2013 · c0c83b3 · c0c83b3
1 parent 4130177
commit c0c83b3
Show file tree

Hide file tree

Showing 51 changed files with 27 additions and 104 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-vendor
-/phpunit.xml
-.buildpath
-.project
-.settings
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/BeSimple/SoapClient/Curl.php → Curl.php b/src/BeSimple/SoapClient/Curl.php → Curl.php
diff --git a/src/BeSimple/SoapClient/MimeFilter.php → MimeFilter.php b/src/BeSimple/SoapClient/MimeFilter.php → MimeFilter.php
diff --git a/src/BeSimple/SoapClient/SoapClient.php → SoapClient.php b/src/BeSimple/SoapClient/SoapClient.php → SoapClient.php
diff --git a/...BeSimple/SoapClient/SoapClientBuilder.php → SoapClientBuilder.php b/...BeSimple/SoapClient/SoapClientBuilder.php → SoapClientBuilder.php
diff --git a/src/BeSimple/SoapClient/SoapKernel.php → SoapKernel.php b/src/BeSimple/SoapClient/SoapKernel.php → SoapKernel.php
diff --git a/src/BeSimple/SoapClient/SoapRequest.php → SoapRequest.php b/src/BeSimple/SoapClient/SoapRequest.php → SoapRequest.php
diff --git a/src/BeSimple/SoapClient/SoapResponse.php → SoapResponse.php b/src/BeSimple/SoapClient/SoapResponse.php → SoapResponse.php
diff --git a/tests/AxisInterop/MTOM.php → Tests/AxisInterop/MTOM.php b/tests/AxisInterop/MTOM.php → Tests/AxisInterop/MTOM.php
diff --git a/tests/AxisInterop/MTOM.wsdl → Tests/AxisInterop/MTOM.wsdl b/tests/AxisInterop/MTOM.wsdl → Tests/AxisInterop/MTOM.wsdl
diff --git a/tests/AxisInterop/SwA.php → Tests/AxisInterop/SwA.php b/tests/AxisInterop/SwA.php → Tests/AxisInterop/SwA.php
diff --git a/tests/AxisInterop/SwA.wsdl → Tests/AxisInterop/SwA.wsdl b/tests/AxisInterop/SwA.wsdl → Tests/AxisInterop/SwA.wsdl
diff --git a/tests/AxisInterop/SwA/build.xml → Tests/AxisInterop/SwA/build.xml b/tests/AxisInterop/SwA/build.xml → Tests/AxisInterop/SwA/build.xml
diff --git a/...terop/SwA/resources/META-INF/services.xml → ...terop/SwA/resources/META-INF/services.xml b/...terop/SwA/resources/META-INF/services.xml → ...terop/SwA/resources/META-INF/services.xml
diff --git a/.../besimple/service/BeSimpleSwaService.java → .../besimple/service/BeSimpleSwaService.java b/.../besimple/service/BeSimpleSwaService.java → .../besimple/service/BeSimpleSwaService.java
diff --git a/tests/AxisInterop/WsAddressing.php → Tests/AxisInterop/WsAddressing.php b/tests/AxisInterop/WsAddressing.php → Tests/AxisInterop/WsAddressing.php
diff --git a/tests/AxisInterop/WsSecuritySigEnc.php → Tests/AxisInterop/WsSecuritySigEnc.php b/tests/AxisInterop/WsSecuritySigEnc.php → Tests/AxisInterop/WsSecuritySigEnc.php
diff --git a/tests/AxisInterop/WsSecuritySigEnc.wsdl → Tests/AxisInterop/WsSecuritySigEnc.wsdl b/tests/AxisInterop/WsSecuritySigEnc.wsdl → Tests/AxisInterop/WsSecuritySigEnc.wsdl
diff --git a/tests/AxisInterop/WsSecurityUserPass.php → Tests/AxisInterop/WsSecurityUserPass.php b/tests/AxisInterop/WsSecurityUserPass.php → Tests/AxisInterop/WsSecurityUserPass.php
diff --git a/tests/AxisInterop/WsSecurityUserPass.wsdl → Tests/AxisInterop/WsSecurityUserPass.wsdl b/tests/AxisInterop/WsSecurityUserPass.wsdl → Tests/AxisInterop/WsSecurityUserPass.wsdl
diff --git a/...xisInterop/axis_services/besimple-swa.aar → ...xisInterop/axis_services/besimple-swa.aar b/...xisInterop/axis_services/besimple-swa.aar → ...xisInterop/axis_services/besimple-swa.aar
diff --git a/...nterop/axis_services/library-signencr.aar → ...nterop/axis_services/library-signencr.aar b/...nterop/axis_services/library-signencr.aar → ...nterop/axis_services/library-signencr.aar
diff --git a/...axis_services/library-username-digest.aar → ...axis_services/library-username-digest.aar b/...axis_services/library-username-digest.aar → ...axis_services/library-username-digest.aar
diff --git a/...AxisInterop/axis_services/sample-mtom.aar → ...AxisInterop/axis_services/sample-mtom.aar b/...AxisInterop/axis_services/sample-mtom.aar → ...AxisInterop/axis_services/sample-mtom.aar
diff --git a/tests/AxisInterop/axis_services/version2.aar → Tests/AxisInterop/axis_services/version2.aar b/tests/AxisInterop/axis_services/version2.aar → Tests/AxisInterop/axis_services/version2.aar
diff --git a/tests/AxisInterop/clientcert.pem → Tests/AxisInterop/clientcert.pem b/tests/AxisInterop/clientcert.pem → Tests/AxisInterop/clientcert.pem
diff --git a/tests/AxisInterop/clientkey.pem → Tests/AxisInterop/clientkey.pem b/tests/AxisInterop/clientkey.pem → Tests/AxisInterop/clientkey.pem
diff --git a/tests/AxisInterop/image.jpg → Tests/AxisInterop/image.jpg b/tests/AxisInterop/image.jpg → Tests/AxisInterop/image.jpg
diff --git a/tests/AxisInterop/servercert.pem → Tests/AxisInterop/servercert.pem b/tests/AxisInterop/servercert.pem → Tests/AxisInterop/servercert.pem
diff --git a/tests/BeSimple/Tests/SoapClient/CurlTest.php → Tests/CurlTest.php b/tests/BeSimple/Tests/SoapClient/CurlTest.php → Tests/CurlTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\SoapClient;
+namespace BeSimple\SoapClient\Tests;
 
 use BeSimple\SoapClient\Curl;
 
@@ -23,7 +23,9 @@ class CurlTest extends \PHPUnit_Framework_TestCase
 
     protected function startPhpWebserver()
     {
-            $dir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures';
+        $this->markTestSkipped('Start a local webserver is not the best practice');
+
+        $dir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures';
         if ('Windows' == substr(php_uname('s'), 0, 7)) {
             $powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".$dir."' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;";
             $shellCommand = 'powershell -command "& {'.$powershellCommand.'}"';
@@ -178,4 +180,4 @@ public function testGetResponseStatusMessage()
 
         $this->stopPhpWebserver();
     }
-}
+}
diff --git a/...Simple/Tests/SoapClient/Fixtures/curl.txt → Tests/Fixtures/curl.txt b/...Simple/Tests/SoapClient/Fixtures/curl.txt → Tests/Fixtures/curl.txt
diff --git a/...ple/Tests/SoapClient/Fixtures/foobar.wsdl → Tests/Fixtures/foobar.wsdl b/...ple/Tests/SoapClient/Fixtures/foobar.wsdl → Tests/Fixtures/foobar.wsdl
diff --git a/...ests/SoapClient/Fixtures/type_include.xsd → Tests/Fixtures/type_include.xsd b/...ests/SoapClient/Fixtures/type_include.xsd → Tests/Fixtures/type_include.xsd
diff --git a/...sts/SoapClient/Fixtures/wsdl_include.wsdl → Tests/Fixtures/wsdl_include.wsdl b/...sts/SoapClient/Fixtures/wsdl_include.wsdl → Tests/Fixtures/wsdl_include.wsdl
diff --git a/...ures/wsdlinclude/wsdlinctest_absolute.xml → ...ures/wsdlinclude/wsdlinctest_absolute.xml b/...ures/wsdlinclude/wsdlinctest_absolute.xml → ...ures/wsdlinclude/wsdlinctest_absolute.xml
diff --git a/...ures/wsdlinclude/wsdlinctest_relative.xml → ...ures/wsdlinclude/wsdlinctest_relative.xml b/...ures/wsdlinclude/wsdlinctest_relative.xml → ...ures/wsdlinclude/wsdlinctest_relative.xml
diff --git a/...xtures/xsdinclude/xsdinctest_absolute.xml → ...xtures/xsdinclude/xsdinctest_absolute.xml b/...xtures/xsdinclude/xsdinctest_absolute.xml → ...xtures/xsdinclude/xsdinctest_absolute.xml
diff --git a/...xtures/xsdinclude/xsdinctest_relative.xml → ...xtures/xsdinclude/xsdinctest_relative.xml b/...xtures/xsdinclude/xsdinctest_relative.xml → ...xtures/xsdinclude/xsdinctest_relative.xml
diff --git a/tests/ServerInterop/MTOM.php → Tests/ServerInterop/MTOM.php b/tests/ServerInterop/MTOM.php → Tests/ServerInterop/MTOM.php
diff --git a/tests/ServerInterop/MTOM.wsdl → Tests/ServerInterop/MTOM.wsdl b/tests/ServerInterop/MTOM.wsdl → Tests/ServerInterop/MTOM.wsdl
diff --git a/tests/ServerInterop/MTOMServer.php → Tests/ServerInterop/MTOMServer.php b/tests/ServerInterop/MTOMServer.php → Tests/ServerInterop/MTOMServer.php
diff --git a/...ests/SoapClient/SoapClientBuilderTest.php → Tests/SoapClientBuilderTest.php b/...ests/SoapClient/SoapClientBuilderTest.php → Tests/SoapClientBuilderTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapClient\Tests;
 
 use BeSimple\SoapClient\SoapClientBuilder;
 
@@ -116,4 +116,4 @@ private function mergeOptions(array $options)
     {
         return array_merge($this->defaultOptions, $options);
     }
-}
+}
diff --git a/...e/Tests/SoapClient/WsdlDownloaderTest.php → Tests/WsdlDownloaderTest.php b/...e/Tests/SoapClient/WsdlDownloaderTest.php → Tests/WsdlDownloaderTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\SoapClient;
+namespace BeSimple\SoapClient\Tests;
 
 use BeSimple\SoapClient\WsdlDownloader;
 use BeSimple\SoapClient\Curl;
@@ -24,6 +24,8 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
 
     protected function startPhpWebserver()
     {
+        $this->markTestSkipped('Start a local webserver is not the best practice');
+
         $dir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures';
         if ('Windows' == substr(php_uname('s'), 0, 7)) {
             $powershellCommand = "\$app = start-process php.exe -ArgumentList '-S localhost:8000 -t ".$dir."' -WindowStyle 'Hidden' -passthru; Echo \$app.Id;";
@@ -263,4 +265,4 @@ public function testResolveRelativePathInUrl()
         $this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub/sub/sub', '../../../test'));
         $this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub/sub/sub/', '../../../test'));
     }
-}
+}
diff --git a/...eSimple/SoapClient/WsAddressingFilter.php → WsAddressingFilter.php b/...eSimple/SoapClient/WsAddressingFilter.php → WsAddressingFilter.php
diff --git a/src/BeSimple/SoapClient/WsSecurityFilter.php → WsSecurityFilter.php b/src/BeSimple/SoapClient/WsSecurityFilter.php → WsSecurityFilter.php
diff --git a/src/BeSimple/SoapClient/WsdlDownloader.php → WsdlDownloader.php b/src/BeSimple/SoapClient/WsdlDownloader.php → WsdlDownloader.php
diff --git a/src/BeSimple/SoapClient/XmlMimeFilter.php → XmlMimeFilter.php b/src/BeSimple/SoapClient/XmlMimeFilter.php → XmlMimeFilter.php
diff --git a/composer.json b/composer.json
@@ -21,13 +21,14 @@
     ],
     "require": {
         "php": ">=5.3.0",
+        "ext-soap": "*",
+        "ext-curl": "*",
         "besimple/soap-common": "dev-master",
         "ass/xmlsecurity": "dev-master"
     },
     "autoload": {
-        "psr-0": {
-            "BeSimple\\SoapClient": "BeSimple/SoapClient/src/"
-        }
+        "psr-0": { "BeSimple\\SoapClient": "" }
     },
-    "target-dir": "BeSimple/SoapClient"
+    "target-dir": "BeSimple/SoapClient",
+    "minimum-stability": "dev"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,23 +9,21 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
-        <testsuite name="BeSimple\SoapClient Test Suite">
-            <directory>./tests/BeSimple/</directory>
+        <testsuite name="BeSimple SoapClient Test Suite">
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
-    <groups>
-        <exclude>
-            <group>benchmark</group>
-        </exclude>
-    </groups>
-
     <filter>
         <whitelist>
-            <directory>./src/BeSimple/</directory>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Tests/</directory>
+                <directory>./vendor/</directory>
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/vendors.php b/vendors.php