Merge branch 'cs/remove-underscores' of https://github.com/arse/zf2 i…

…nto feature/protected-underscores Conflicts: library/Zend/Console/Getopt.php
zendframework · Jul 27, 2012 · a2ad2a5 · a2ad2a5
commit a2ad2a5
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -123,7 +123,7 @@ class Client implements Stdlib\DispatchableInterface
      *
      * @var resource
      */
-    protected static $_fileInfoDb = null;
+    protected static $fileInfoDb = null;
 
     /**
      * Constructor
@@ -1155,12 +1155,12 @@ protected function detectFileMimeType($file)
 
         // First try with fileinfo functions
         if (function_exists('finfo_open')) {
-            if (self::$_fileInfoDb === null) {
-                self::$_fileInfoDb = @finfo_open(FILEINFO_MIME);
+            if (self::$fileInfoDb === null) {
+                self::$fileInfoDb = @finfo_open(FILEINFO_MIME);
             }
 
-            if (self::$_fileInfoDb) {
-                $type = finfo_file(self::$_fileInfoDb, $file);
+            if (self::$fileInfoDb) {
+                $type = finfo_file(self::$fileInfoDb, $file);
             }
 
         } elseif (function_exists('mime_content_type')) {

diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
@@ -72,7 +72,7 @@ class Socket implements HttpAdapter, StreamInterface
      *
      * @var resource
      */
-    protected $_context = null;
+    protected $context = null;
 
     /**
      * Adapter constructor, currently empty. Config is set using setOptions()
@@ -129,10 +129,10 @@ public function getConfig()
     public function setStreamContext($context)
     {
         if (is_resource($context) && get_resource_type($context) == 'stream-context') {
-            $this->_context = $context;
+            $this->context = $context;
 
         } elseif (is_array($context)) {
-            $this->_context = stream_context_create($context);
+            $this->context = stream_context_create($context);
 
         } else {
             // Invalid parameter
@@ -153,11 +153,11 @@ public function setStreamContext($context)
      */
     public function getStreamContext()
     {
-        if (! $this->_context) {
-            $this->_context = stream_context_create();
+        if (! $this->context) {
+            $this->context = stream_context_create();
         }
 
-        return $this->_context;
+        return $this->context;
     }
 
     /**

diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
@@ -55,7 +55,7 @@ class Test implements AdapterInterface
      *
      * @var boolean
      */
-    protected $_nextRequestWillFail = false;
+    protected $nextRequestWillFail = false;
 
     /**
      * Adapter constructor, currently empty. Config is set using setOptions()
@@ -71,7 +71,7 @@ public function __construct()
      */
     public function setNextRequestWillFail($flag)
     {
-        $this->_nextRequestWillFail = (bool) $flag;
+        $this->nextRequestWillFail = (bool) $flag;
 
         return $this;
     }
@@ -110,8 +110,8 @@ public function setOptions($options = array())
      */
     public function connect($host, $port = 80, $secure = false)
     {
-        if ($this->_nextRequestWillFail) {
-            $this->_nextRequestWillFail = false;
+        if ($this->nextRequestWillFail) {
+            $this->nextRequestWillFail = false;
             throw new Exception\RuntimeException('Request failed');
         }
     }

diff --git a/src/Client/Cookies.php b/src/Client/Cookies.php
@@ -81,7 +81,7 @@ class Cookies
      *
      * @var array
      */
-    protected $_rawCookies = array();
+    protected $rawCookies = array();
 
     /**
      * Construct
@@ -113,7 +113,7 @@ public function addCookie($cookie, $ref_uri = null)
                 $this->cookies[$domain][$path] = array();
             }
             $this->cookies[$domain][$path][$cookie->getName()] = $cookie;
-            $this->_rawCookies[] = $cookie;
+            $this->rawCookies[] = $cookie;
         } else {
             throw new Exception\InvalidArgumentException('Supplient argument is not a valid cookie string or object');
         }
@@ -350,7 +350,7 @@ public static function fromResponse(Response $response, $ref_uri)
      */
     public function count()
     {
-        return count($this->_rawCookies);
+        return count($this->rawCookies);
     }
 
     /**
@@ -360,7 +360,7 @@ public function count()
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->_rawCookies);
+        return new ArrayIterator($this->rawCookies);
     }
 
     /**
@@ -380,7 +380,7 @@ public function isEmpty()
      */
     public function reset()
     {
-        $this->cookies = $this->_rawCookies = array();
+        $this->cookies = $this->rawCookies = array();
         return $this;
     }
 

diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
@@ -25,7 +25,7 @@
  * adapters and configurations.
  *
  * Note that $this->baseuri must point to a directory on a web server
- * containing all the files under the _files directory. You should symlink
+ * containing all the files under the files directory. You should symlink
  * or copy these files and set 'baseuri' properly.
  *
  * You can also set the proper constant in your test configuration file to
@@ -40,7 +40,7 @@
 abstract class CommonHttpTests extends \PHPUnit_Framework_TestCase
 {
     /**
-     * The bast URI for this test, containing all files in the _files directory
+     * The bast URI for this test, containing all files in the files directory
      * Should be set in TestConfiguration.php or TestConfiguration.php.dist
      *
      * @var string

diff --git a/test/Client/CurlTest.php b/test/Client/CurlTest.php
@@ -20,7 +20,7 @@
  * adapters and configurations.
  *
  * Note that $this->baseuri must point to a directory on a web server
- * containing all the files under the _files directory. You should symlink
+ * containing all the files under the files directory. You should symlink
  * or copy these files and set 'baseuri' properly.
  *
  * You can also set the proper constand in your test configuration file to

diff --git a/test/Client/SocketKeepaliveTest.php b/test/Client/SocketKeepaliveTest.php
@@ -17,7 +17,7 @@
  * adapters and configurations.
  *
  * Note that $this->baseuri must point to a directory on a web server
- * containing all the files under the _files directory. You should symlink
+ * containing all the files under the files directory. You should symlink
  * or copy these files and set 'baseuri' properly.
  *
  * You can also set the proper constand in your test configuration file to

diff --git a/test/Client/SocketPersistentTest.php b/test/Client/SocketPersistentTest.php
@@ -17,7 +17,7 @@
  * adapters and configurations.
  *
  * Note that $this->baseuri must point to a directory on a web server
- * containing all the files under the _files directory. You should symlink
+ * containing all the files under the files directory. You should symlink
  * or copy these files and set 'baseuri' properly.
  *
  * You can also set the proper constand in your test configuration file to

diff --git a/test/Client/SocketTest.php b/test/Client/SocketTest.php
@@ -19,7 +19,7 @@
  * adapters and configurations.
  *
  * Note that $this->baseuri must point to a directory on a web server
- * containing all the files under the _files directory. You should symlink
+ * containing all the files under the files directory. You should symlink
  * or copy these files and set 'baseuri' properly.
  *
  * You can also set the proper constant in your test configuration file to

diff --git a/test/Client/UseCaseTest.php b/test/Client/UseCaseTest.php
@@ -29,7 +29,7 @@
 class UseCaseTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * The bast URI for this test, containing all files in the _files directory
+     * The bast URI for this test, containing all files in the files directory
      * Should be set in TestConfiguration.php or TestConfiguration.php.dist
      *
      * @var string