Reorganized directories structure

BeSimple · Jul 19, 2013 · b676093 · b676093
1 parent db885b2
commit b676093
Show file tree

Hide file tree

Showing 63 changed files with 37 additions and 94 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/.travis.yml b/.travis.yml
diff --git a/...Simple/SoapCommon/AbstractSoapBuilder.php → AbstractSoapBuilder.php b/...Simple/SoapCommon/AbstractSoapBuilder.php → AbstractSoapBuilder.php
diff --git a/src/BeSimple/SoapCommon/Cache.php → Cache.php b/src/BeSimple/SoapCommon/Cache.php → Cache.php
diff --git a/src/BeSimple/SoapCommon/Classmap.php → Classmap.php b/src/BeSimple/SoapCommon/Classmap.php → Classmap.php
diff --git a/...ommon/Converter/DateTimeTypeConverter.php → Converter/DateTimeTypeConverter.php b/...ommon/Converter/DateTimeTypeConverter.php → Converter/DateTimeTypeConverter.php
diff --git a/...oapCommon/Converter/DateTypeConverter.php → Converter/DateTypeConverter.php b/...oapCommon/Converter/DateTypeConverter.php → Converter/DateTypeConverter.php
diff --git a/...oapCommon/Converter/MtomTypeConverter.php → Converter/MtomTypeConverter.php b/...oapCommon/Converter/MtomTypeConverter.php → Converter/MtomTypeConverter.php
diff --git a/...on/Converter/SoapKernelAwareInterface.php → Converter/SoapKernelAwareInterface.php b/...on/Converter/SoapKernelAwareInterface.php → Converter/SoapKernelAwareInterface.php
diff --git a/...SoapCommon/Converter/SwaTypeConverter.php → Converter/SwaTypeConverter.php b/...SoapCommon/Converter/SwaTypeConverter.php → Converter/SwaTypeConverter.php
diff --git a/...mon/Converter/TypeConverterCollection.php → Converter/TypeConverterCollection.php b/...mon/Converter/TypeConverterCollection.php → Converter/TypeConverterCollection.php
diff --git a/...mmon/Converter/TypeConverterInterface.php → Converter/TypeConverterInterface.php b/...mmon/Converter/TypeConverterInterface.php → Converter/TypeConverterInterface.php
diff --git a/src/BeSimple/SoapCommon/FilterHelper.php → FilterHelper.php b/src/BeSimple/SoapCommon/FilterHelper.php → FilterHelper.php
diff --git a/src/BeSimple/SoapCommon/Helper.php → Helper.php b/src/BeSimple/SoapCommon/Helper.php → Helper.php
diff --git a/src/BeSimple/SoapCommon/Mime/MultiPart.php → Mime/MultiPart.php b/src/BeSimple/SoapCommon/Mime/MultiPart.php → Mime/MultiPart.php
diff --git a/src/BeSimple/SoapCommon/Mime/Parser.php → Mime/Parser.php b/src/BeSimple/SoapCommon/Mime/Parser.php → Mime/Parser.php
diff --git a/src/BeSimple/SoapCommon/Mime/Part.php → Mime/Part.php b/src/BeSimple/SoapCommon/Mime/Part.php → Mime/Part.php
diff --git a/src/BeSimple/SoapCommon/Mime/PartHeader.php → Mime/PartHeader.php b/src/BeSimple/SoapCommon/Mime/PartHeader.php → Mime/PartHeader.php
diff --git a/src/BeSimple/SoapCommon/SoapKernel.php → SoapKernel.php b/src/BeSimple/SoapCommon/SoapKernel.php → SoapKernel.php
diff --git a/src/BeSimple/SoapCommon/SoapMessage.php → SoapMessage.php b/src/BeSimple/SoapCommon/SoapMessage.php → SoapMessage.php
diff --git a/src/BeSimple/SoapCommon/SoapRequest.php → SoapRequest.php b/src/BeSimple/SoapCommon/SoapRequest.php → SoapRequest.php
diff --git a/...BeSimple/SoapCommon/SoapRequestFilter.php → SoapRequestFilter.php b/...BeSimple/SoapCommon/SoapRequestFilter.php → SoapRequestFilter.php
diff --git a/src/BeSimple/SoapCommon/SoapResponse.php → SoapResponse.php b/src/BeSimple/SoapCommon/SoapResponse.php → SoapResponse.php
diff --git a/...eSimple/SoapCommon/SoapResponseFilter.php → SoapResponseFilter.php b/...eSimple/SoapCommon/SoapResponseFilter.php → SoapResponseFilter.php
diff --git a/...ts/SoapCommon/AbstractSoapBuilderTest.php → Tests/AbstractSoapBuilderTest.php b/...ts/SoapCommon/AbstractSoapBuilderTest.php → Tests/AbstractSoapBuilderTest.php
@@ -10,14 +10,14 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Cache;
 use BeSimple\SoapCommon\Classmap;
 use BeSimple\SoapCommon\Converter\DateTimeTypeConverter;
 use BeSimple\SoapCommon\Converter\DateTypeConverter;
 use BeSimple\SoapCommon\Converter\TypeConverterCollection;
-use BeSimple\Tests\SoapCommon\Fixtures\SoapBuilder;
+use BeSimple\SoapCommon\Tests\Fixtures\SoapBuilder;
 
 class AbstractSoapBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -194,7 +194,7 @@ public function testCreateWithDefaults()
     {
         $builder = SoapBuilder::createWithDefaults();
 
-        $this->assertInstanceOf('BeSimple\Tests\SoapCommon\Fixtures\SoapBuilder', $builder);
+        $this->assertInstanceOf('BeSimple\SoapCommon\Tests\Fixtures\SoapBuilder', $builder);
 
         $this->assertEquals($this->mergeOptions(array('soap_version' => SOAP_1_2, 'encoding' => 'UTF-8', 'features' => SOAP_SINGLE_ELEMENT_ARRAYS)), $builder->getSoapOptions());
     }
@@ -208,4 +208,4 @@ private function mergeOptions(array $options)
     {
         return array_merge($this->defaultOptions, $options);
     }
-}
+}
diff --git a/...s/BeSimple/Tests/SoapCommon/CacheTest.php → Tests/CacheTest.php b/...s/BeSimple/Tests/SoapCommon/CacheTest.php → Tests/CacheTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Cache;
 use org\bovigo\vfs\vfsStream;
@@ -91,4 +91,4 @@ public function setUp()
         ini_restore('soap.wsdl_cache_ttl');
         ini_restore('soap.wsdl_cache_limit');
     }
-}
+}
diff --git a/...eSimple/Tests/SoapCommon/ClassmapTest.php → Tests/ClassmapTest.php b/...eSimple/Tests/SoapCommon/ClassmapTest.php → Tests/ClassmapTest.php
diff --git a/...n/Converter/DateTimeTypeConverterTest.php → ...s/Converter/DateTimeTypeConverterTest.php b/...n/Converter/DateTimeTypeConverterTest.php → ...s/Converter/DateTimeTypeConverterTest.php
diff --git a/...ommon/Converter/DateTypeConverterTest.php → Tests/Converter/DateTypeConverterTest.php b/...ommon/Converter/DateTypeConverterTest.php → Tests/Converter/DateTypeConverterTest.php
diff --git a/...Converter/TypeConverterCollectionTest.php → ...Converter/TypeConverterCollectionTest.php b/...Converter/TypeConverterCollectionTest.php → ...Converter/TypeConverterCollectionTest.php
diff --git a/...ts/SoapCommon/Fixtures/MimePartHeader.php → Tests/Fixtures/MimePartHeader.php b/...ts/SoapCommon/Fixtures/MimePartHeader.php → Tests/Fixtures/MimePartHeader.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeSimple\Tests\SoapCommon\Fixtures;
+namespace BeSimple\SoapCommon\Tests\Fixtures;
 
 use BeSimple\SoapCommon\Mime\PartHeader;
 
 class MimePartHeader extends PartHeader
 {
-}
+}
diff --git a/...Tests/SoapCommon/Fixtures/SoapBuilder.php → Tests/Fixtures/SoapBuilder.php b/...Tests/SoapCommon/Fixtures/SoapBuilder.php → Tests/Fixtures/SoapBuilder.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeSimple\Tests\SoapCommon\Fixtures;
+namespace BeSimple\SoapCommon\Tests\Fixtures;
 
 use BeSimple\SoapCommon\AbstractSoapBuilder;
 
 class SoapBuilder extends AbstractSoapBuilder
 {
-}
+}
diff --git a/...apCommon/Fixtures/SwA-response-amazon.txt → Tests/Fixtures/SwA-response-amazon.txt b/...apCommon/Fixtures/SwA-response-amazon.txt → Tests/Fixtures/SwA-response-amazon.txt
diff --git a/...SoapCommon/Fixtures/SwA-response-axis.txt → Tests/Fixtures/SwA-response-axis.txt b/...SoapCommon/Fixtures/SwA-response-axis.txt → Tests/Fixtures/SwA-response-axis.txt
diff --git a/...SoapCommon/Fixtures/WS-I-MTOM-request.txt → Tests/Fixtures/WS-I-MTOM-request.txt b/...SoapCommon/Fixtures/WS-I-MTOM-request.txt → Tests/Fixtures/WS-I-MTOM-request.txt
diff --git a/...n/Fixtures/WS-I-MTOM-request_noheader.txt → ...s/Fixtures/WS-I-MTOM-request_noheader.txt b/...n/Fixtures/WS-I-MTOM-request_noheader.txt → ...s/Fixtures/WS-I-MTOM-request_noheader.txt
diff --git a/...oapCommon/Fixtures/WS-I-MTOM-response.txt → Tests/Fixtures/WS-I-MTOM-response.txt b/...oapCommon/Fixtures/WS-I-MTOM-response.txt → Tests/Fixtures/WS-I-MTOM-response.txt
diff --git a/.../SoapCommon/Fixtures/WsdlMimeContent.wsdl → Tests/Fixtures/WsdlMimeContent.wsdl b/.../SoapCommon/Fixtures/WsdlMimeContent.wsdl → Tests/Fixtures/WsdlMimeContent.wsdl
diff --git a/...SoapCommon/Fixtures/WsdlMimeContent2.wsdl → Tests/Fixtures/WsdlMimeContent2.wsdl b/...SoapCommon/Fixtures/WsdlMimeContent2.wsdl → Tests/Fixtures/WsdlMimeContent2.wsdl
diff --git a/...SoapCommon/Fixtures/WsdlMimeContent3.wsdl → Tests/Fixtures/WsdlMimeContent3.wsdl b/...SoapCommon/Fixtures/WsdlMimeContent3.wsdl → Tests/Fixtures/WsdlMimeContent3.wsdl
diff --git a/.../Tests/SoapCommon/Fixtures/clientcert.pem → Tests/Fixtures/clientcert.pem b/.../Tests/SoapCommon/Fixtures/clientcert.pem → Tests/Fixtures/clientcert.pem
diff --git a/...e/Tests/SoapCommon/Fixtures/clientkey.pem → Tests/Fixtures/clientkey.pem b/...e/Tests/SoapCommon/Fixtures/clientkey.pem → Tests/Fixtures/clientkey.pem
diff --git a/.../Tests/SoapCommon/Fixtures/servercert.pem → Tests/Fixtures/servercert.pem b/.../Tests/SoapCommon/Fixtures/servercert.pem → Tests/Fixtures/servercert.pem
diff --git a/...e/Tests/SoapCommon/Mime/MultiPartTest.php → Tests/Mime/MultiPartTest.php b/...e/Tests/SoapCommon/Mime/MultiPartTest.php → Tests/Mime/MultiPartTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Mime\MultiPart;
 use BeSimple\SoapCommon\Mime\Part;
@@ -141,4 +141,4 @@ public function testGetParts()
         );
         $this->assertEquals($withMain, $mp->getParts(true));
     }
-}
+}
diff --git a/...mple/Tests/SoapCommon/Mime/ParserTest.php → Tests/Mime/ParserTest.php b/...mple/Tests/SoapCommon/Mime/ParserTest.php → Tests/Mime/ParserTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Mime\MultiPart;
 use BeSimple\SoapCommon\Mime\Parser;

diff --git a/.../Tests/SoapCommon/Mime/PartHeaderTest.php → Tests/Mime/PartHeaderTest.php b/.../Tests/SoapCommon/Mime/PartHeaderTest.php → Tests/Mime/PartHeaderTest.php
@@ -10,10 +10,10 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Mime\PartHeader;
-use BeSimple\Tests\SoapCommon\Fixtures\MimePartHeader;
+use BeSimple\SoapCommon\Tests\Fixtures\MimePartHeader;
 
 class PartHeaderTest extends \PHPUnit_Framework_TestCase
 {
@@ -54,4 +54,4 @@ public function testGenerateHeaders()
         $ph->setHeader('Content-Type', 'type', 'text/xml');
         $this->assertEquals("Content-Type: text/xml; charset=utf-8; type=\"text/xml\"\r\n", $method->invoke($ph));
     }
-}
+}
diff --git a/...Simple/Tests/SoapCommon/Mime/PartTest.php → Tests/Mime/PartTest.php b/...Simple/Tests/SoapCommon/Mime/PartTest.php → Tests/Mime/PartTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\Mime\Part;
 use BeSimple\SoapCommon\Mime\PartHeader;
@@ -59,4 +59,4 @@ public function testGetMessagePart()
 
         $this->assertEquals($messagePart, $p->getMessagePart());
     }
-}
+}
diff --git a/...le/Tests/SoapCommon/WsSecurityKeyTest.php → Tests/WsSecurityKeyTest.php b/...le/Tests/SoapCommon/WsSecurityKeyTest.php → Tests/WsSecurityKeyTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\WsSecurityKey;
 use ass\XmlSecurity\Key as XmlSecurityKey;

diff --git a/...mple/Tests/SoapCommon/WsdlHandlerTest.php → Tests/WsdlHandlerTest.php b/...mple/Tests/SoapCommon/WsdlHandlerTest.php → Tests/WsdlHandlerTest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapCommon\Soap;
+namespace BeSimple\SoapCommon\Tests;
 
 use BeSimple\SoapCommon\WsdlHandler;
 
@@ -45,4 +45,4 @@ public function testIsValidMimeTypeType()
         $this->assertTrue($wh->isValidMimeTypeType('http://example.com/soapaction', WsdlHandler::BINDING_OPERATION_INPUT, 'ClaimPhoto', 'image/gif'));
         $this->assertTrue($wh->isValidMimeTypeType('http://example.com/soapaction', WsdlHandler::BINDING_OPERATION_INPUT, 'ClaimPhoto', 'text/xml'));
     }
-}
+}
diff --git a/...mple/SoapCommon/Type/AbstractKeyValue.php → Type/AbstractKeyValue.php b/...mple/SoapCommon/Type/AbstractKeyValue.php → Type/AbstractKeyValue.php
diff --git a/...mple/SoapCommon/Type/KeyValue/Boolean.php → Type/KeyValue/Boolean.php b/...mple/SoapCommon/Type/KeyValue/Boolean.php → Type/KeyValue/Boolean.php
diff --git a/...eSimple/SoapCommon/Type/KeyValue/Date.php → Type/KeyValue/Date.php b/...eSimple/SoapCommon/Type/KeyValue/Date.php → Type/KeyValue/Date.php
diff --git a/...ple/SoapCommon/Type/KeyValue/DateTime.php → Type/KeyValue/DateTime.php b/...ple/SoapCommon/Type/KeyValue/DateTime.php → Type/KeyValue/DateTime.php
diff --git a/...Simple/SoapCommon/Type/KeyValue/Float.php → Type/KeyValue/Float.php b/...Simple/SoapCommon/Type/KeyValue/Float.php → Type/KeyValue/Float.php
diff --git a/...BeSimple/SoapCommon/Type/KeyValue/Int.php → Type/KeyValue/Int.php b/...BeSimple/SoapCommon/Type/KeyValue/Int.php → Type/KeyValue/Int.php
diff --git a/...imple/SoapCommon/Type/KeyValue/String.php → Type/KeyValue/String.php b/...imple/SoapCommon/Type/KeyValue/String.php → Type/KeyValue/String.php
diff --git a/...eSimple/SoapCommon/Util/MessageBinder.php → Util/MessageBinder.php b/...eSimple/SoapCommon/Util/MessageBinder.php → Util/MessageBinder.php
diff --git a/src/BeSimple/SoapCommon/WsSecurityKey.php → WsSecurityKey.php b/src/BeSimple/SoapCommon/WsSecurityKey.php → WsSecurityKey.php
diff --git a/src/BeSimple/SoapCommon/WsdlHandler.php → WsdlHandler.php b/src/BeSimple/SoapCommon/WsdlHandler.php → WsdlHandler.php
diff --git a/composer.json b/composer.json
@@ -21,14 +21,15 @@
     ],
     "require": {
         "php": ">=5.3.0",
+        "ext-soap": "*",
         "ass/xmlsecurity": "dev-master"
     },
     "require-dev": {
         "mikey179/vfsStream": "dev-master"
     },
     "autoload": {
-        "psr-0": {
-            "BeSimple\\SoapCommon": "src/"
-        }
-    }
+        "psr-0": { "BeSimple\\SoapCommon": "" }
+    },
+    "target-dir": "BeSimple/SoapCommon",
+    "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\SoapCommon Test Suite">
-            <directory>./tests/BeSimple/</directory>
+        <testsuite name="BeSimple SoapCommon 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