Update tests

Author: frost-nzcr4

composer.json

@@ -35,11 +35,7 @@
     },
     "autoload": {
         "classmap": [
-            "core",
-            "http",
-            "xep",
-            "xmpp",
-            "jaxl.php"
+            "src/JAXL"
         ],
         "exclude-from-classmap": [
             "/tests/"

phpcs.xml

@@ -2,13 +2,8 @@
 <ruleset name="JAXL">
  <description>The JAXL coding standard (based on PSR-2 excluding some rules).</description>
 
- <file>core</file>
  <file>examples</file>
- <file>http</file>
- <file>tests</file>
- <file>xep</file>
- <file>xmpp</file>
- <file>jaxl.php</file>
+ <file>src/JAXL</file>
  <file>jaxlctl</file>
 
  <arg value="p"/>
@@ -28,9 +23,8 @@
   <severity>0</severity>
  </rule>
 
- <!-- TODO: Register autoload (spl_autoload_register), remove include and require everywhere then remove this rule. -->
  <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
-  <severity>0</severity>
+  <exclude-pattern>examples</exclude-pattern>
  </rule>
 
  <!-- TODO: Rename all methods then remove this rule. -->

src/JAXL/jaxl.php

@@ -479,11 +479,10 @@ public function start(array $opts = array())
             // emit
             $this->ev->emit('on_disconnect');
         } else {
-            // if connection to the destination fails
-
-            if ($this->trans->errno == 61
-            || $this->trans->errno == 110
-            || $this->trans->errno == 111
+            // If connection to the destination fails.
+            if ($this->trans->errno == 61 ||
+                $this->trans->errno == 110 ||
+                $this->trans->errno == 111
             ) {
                 JAXLLogger::debug("unable to connect with errno ".$this->trans->errno." (".$this->trans->errstr.")");
                 $this->retry();

tests/JAXLLoggerTest.php

@@ -4,15 +4,12 @@ class JAXLLoggerTest extends PHPUnit_Framework_TestCase
 {
 
     /**
-     * @runInSeparateProcess<--fixme
+     * @runInSeparateProcess
      */
     public function testColorize()
     {
         $msg = 'Test message';
 
-        // TODO: Fix JAXL to run with @runInSeparateProcess and remove following line.
-        $current = JAXLLogger::$colorize;
-        
         JAXLLogger::$colorize = false;
         $this->assertEquals($msg, JAXLLogger::colorize($msg, JAXLLogger::ERROR));
 
@@ -24,9 +21,6 @@ public function testColorize()
             JAXLLogger::ERROR => $color
         ));
         $this->assertEquals("\033[" . $color . "m" . $msg . "\033[0m", JAXLLogger::colorize($msg, JAXLLogger::ERROR));
-
-        // TODO: Fix JAXL to run with @runInSeparateProcess and remove following line.
-        JAXLLogger::$colorize = $current;
     }
 
     /**

tests/JAXLTest.php

@@ -48,7 +48,8 @@ public function testProtocolOption()
         $config = array(
             'host' => 'domain.tld',
             'port' => 5223,
-            'protocol' => 'tcp'
+            'protocol' => 'tcp',
+            'strict' => false
         );
         $jaxl = new JAXL($config);
         $this->assertEquals('tcp://domain.tld:5223', $jaxl->get_socket_path());
@@ -57,7 +58,7 @@ public function testProtocolOption()
 
     public function testConfig()
     {
-        $config = array();
+        $config = array('strict' => false);
         $jaxl = new JAXL($config);
 
         $this->assertEquals('PLAIN', $jaxl->cfg['auth_type']);
@@ -79,6 +80,6 @@ public function testConfig()
         $this->assertNull($jaxl->cfg['protocol']);
         $this->assertNull($jaxl->cfg['resource']);
         $this->assertNull($jaxl->cfg['stream_context']);
-        $this->assertTrue($jaxl->cfg['strict']);
+        $this->assertFalse($jaxl->cfg['strict']);
     }
 }

tests/JAXLXmlTest.php

@@ -7,6 +7,7 @@ class JAXLXmlTest extends PHPUnit_Framework_TestCase
     public static $attrs = array('attr1' => 'value1');
 
     /**
+     * @runInSeparateProcess-
      * @expectedException PHPUnit_Framework_Error_Warning
      */
     public function testJAXLXml_0()