Merge pull request php-webdriver#281 from voku/small-fixes

gfosco · gfosco · commit 787e71db74e4 · 2016-02-26T07:35:10.000-08:00
fixed some small code-smells (reported by PhpStorm)
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
@@ -131,10 +131,10 @@ public function encode() {
       $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($extension_datas, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
       foreach ($iterator as $item) {
         if ($item->isDir()) {
-	  mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
-	} else {
-	  copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
-	}
+          mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+        } else {
+          copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+        }
       }
     }
 
@@ -150,15 +150,18 @@ public function encode() {
 
     $dir = new RecursiveDirectoryIterator($temp_dir);
     $files = new RecursiveIteratorIterator($dir);
+
+    $dir_prefix = preg_replace(
+        '#\\\\#',
+        '\\\\\\\\',
+        $temp_dir.DIRECTORY_SEPARATOR
+    );
+
     foreach ($files as $name => $object) {
       if (is_dir($name)) {
         continue;
       }
-      $dir_prefix = preg_replace(
-        '#\\\\#',
-        '\\\\\\\\',
-        $temp_dir.DIRECTORY_SEPARATOR
-      );
+
       $path = preg_replace("#^{$dir_prefix}#", "", $name);
       $zip->addFile($name, $path);
     }
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
@@ -109,7 +109,7 @@ public function stop() {
     $this->process = null;
 
     $checker = new URLChecker();
-    $checker->waitUntilUnAvailable(3 * 1000, $this->url.'/shutdown');
+    $checker->waitUntilUnavailable(3 * 1000, $this->url.'/shutdown');
 
     return $this;
   }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
@@ -40,8 +40,8 @@ protected function setUp() {
   
   protected function tearDown() {
     if ($this->driver) {
-	    $this->driver->quit();
-	  }
+      $this->driver->quit();
+    }
   }
 
   /**
@@ -51,6 +51,6 @@ protected function tearDown() {
    * @return string
    */
   protected function getTestPath($path) {
-    return 'file:///'.dirname(__FILE__).'/html/'.$path;
+    return 'file:///'.__DIR__.'/html/'.$path;
   }
 }
diff --git a/tests/functional/html/upload.html b/tests/functional/html/upload.html
@@ -4,7 +4,7 @@
 </head>
 <body>
   <form method="post" enctype="multipart/form-data">
-    <input type="file" id="upload"></input>
+    <input type="file" id="upload" />
   </form>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function stop() {`
`109`	`109`	`$this->process = null;`
`110`	`110`
`111`	`111`	`$checker = new URLChecker();`
`112`		`- $checker->waitUntilUnAvailable(3 * 1000, $this->url.'/shutdown');`
	`112`	`+ $checker->waitUntilUnavailable(3 * 1000, $this->url.'/shutdown');`
`113`	`113`
`114`	`114`	`return $this;`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ protected function setUp() {`
`40`	`40`
`41`	`41`	`protected function tearDown() {`
`42`	`42`	`if ($this->driver) {`
`43`		`- $this->driver->quit();`
`44`		`- }`
	`43`	`+ $this->driver->quit();`
	`44`	`+ }`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`@@ -51,6 +51,6 @@ protected function tearDown() {`
`51`	`51`	`* @return string`
`52`	`52`	`*/`
`53`	`53`	`protected function getTestPath($path) {`
`54`		`- return 'file:///'.dirname(__FILE__).'/html/'.$path;`
	`54`	`+ return 'file:///'.__DIR__.'/html/'.$path;`
`55`	`55`	`}`
`56`	`56`	`}`