Fix conflicts and merge.

taylorotwell · taylorotwell · commit 15e68f6177a2 · 2014-05-24T20:50:15.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,17 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - hhvm-nightly
 
 before_script:
-  - composer self-update
-  - composer install --prefer-source --no-interaction --dev
+  - travis_retry composer self-update
+  - travis_retry composer install --prefer-source --no-interaction --dev
 
-script: phpunit
+script: vendor/bin/phpunit --verbose
 
 matrix:
   allow_failures:
     - php: 5.6
     - php: hhvm
+    - php: hhvm-nightly
   fast_finish: true
diff --git a/composer.json b/composer.json
@@ -70,8 +70,8 @@
         "aws/aws-sdk-php": "~2.6",
         "iron-io/iron_mq": "~1.5",
         "pda/pheanstalk": "~2.1",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "mockery/mockery": "~0.9",
+        "phpunit/phpunit": "~4.0"
     },
     "autoload": {
         "classmap": [
diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json
@@ -20,8 +20,7 @@
     },
     "require-dev": {
         "illuminate/console": "4.3.*",
-        "illuminate/routing": "4.3.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/routing": "4.3.*"
     },
     "autoload": {
         "psr-0": {"Illuminate\\Auth": ""}
diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json
@@ -13,7 +13,6 @@
         "nesbot/carbon": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
         "illuminate/database": "4.3.*",
         "illuminate/encryption": "4.3.*",
         "illuminate/filesystem": "4.3.*",
diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json
@@ -12,9 +12,6 @@
         "illuminate/filesystem": "4.3.*",
         "illuminate/support": "4.3.*"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {"Illuminate\\Config": ""}
     },
diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json
@@ -11,9 +11,6 @@
         "php": ">=5.4.0",
         "symfony/console": "2.5.*"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Console": ""
diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json
@@ -10,9 +10,6 @@
     "require": {
         "php": ">=5.4.0"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Container": ""
diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json
@@ -14,10 +14,6 @@
         "symfony/http-kernel": "2.5.*",
         "symfony/http-foundation": "2.5.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Cookie": ""
diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json
@@ -20,9 +20,7 @@
         "illuminate/console": "4.3.*",
         "illuminate/filesystem": "4.3.*",
         "illuminate/pagination": "4.3.*",
-        "illuminate/support": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/support": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json
@@ -12,9 +12,6 @@
         "illuminate/support": "4.3.*",
         "symfony/security-core": "2.5.*"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Encryption": ""
diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json
@@ -12,10 +12,6 @@
         "illuminate/container": "4.3.*",
         "illuminate/support": "4.3.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Events": ""
diff --git a/src/Illuminate/Exception/composer.json b/src/Illuminate/Exception/composer.json
@@ -15,9 +15,7 @@
         "symfony/http-kernel": "2.5.*"
     },
     "require-dev": {
-        "monolog/monolog": "~1.6",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "monolog/monolog": "~1.6"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json
@@ -12,9 +12,6 @@
         "illuminate/support": "4.3.*",
         "symfony/finder": "2.5.*"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Filesystem": ""
diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json
@@ -12,9 +12,6 @@
         "illuminate/support": "4.3.*",
         "ircmaxell/password-compat": "~1.0"
     },
-    "require-dev": {
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Hashing": ""
diff --git a/src/Illuminate/Html/composer.json b/src/Illuminate/Html/composer.json
@@ -13,10 +13,6 @@
         "illuminate/session": "4.3.*",
         "illuminate/support": "4.3.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Html": ""
diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json
@@ -14,10 +14,6 @@
         "symfony/http-foundation": "2.5.*",
         "symfony/http-kernel": "2.5.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Http": ""
diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json
@@ -13,9 +13,7 @@
         "monolog/monolog": "~1.6"
     },
     "require-dev": {
-        "illuminate/events": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/events": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -16,9 +16,7 @@
         "swiftmailer/swiftmailer": "~5.1"
     },
     "require-dev": {
-        "illuminate/queue": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/queue": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json
@@ -15,10 +15,6 @@
         "symfony/http-foundation": "2.5.*",
         "symfony/translation": "2.5.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Pagination": ""
diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json
@@ -19,9 +19,7 @@
         "illuminate/events": "4.3.*",
         "aws/aws-sdk-php": "~2.6",
         "iron-io/iron_mq": "~1.5",
-        "pda/pheanstalk": "~2.1",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "pda/pheanstalk": "~2.1"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json
@@ -12,10 +12,6 @@
         "illuminate/support": "4.3.*",
         "predis/predis": "0.8.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Redis": ""
diff --git a/src/Illuminate/Remote/composer.json b/src/Illuminate/Remote/composer.json
@@ -14,9 +14,7 @@
         "phpseclib/phpseclib": "0.3.*"
     },
     "require-dev": {
-        "illuminate/console": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/console": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json
@@ -19,9 +19,7 @@
     },
     "require-dev": {
         "illuminate/console": "4.3.*",
-        "illuminate/filesystem": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/filesystem": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json
@@ -18,9 +18,7 @@
         "symfony/http-foundation": "2.5.*"
     },
     "require-dev": {
-        "illuminate/console": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/console": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -376,6 +376,18 @@ public function reverse()
 		return new static(array_reverse($this->items));
 	}
 
+	/**
+	 * Search the collection for a given value and return the corresponding key if successful.
+	 *
+	 * @param  mixed  $value
+	 * @param  bool   $strict
+	 * @return mixed
+	 */
+	public function search($value, $strict = false)
+	{
+		return array_search($value, $this->items, $strict);
+	}
+
 	/**
 	 * Get and remove the first item from the collection.
 	 *
@@ -711,7 +723,7 @@ public function __toString()
   	 * @param  \Illuminate\Support\Collection|\Illuminate\Support\Contracts\ArrayableInterface|array  $items
 	 * @return array
 	 */
-	private function getArrayableItems($items)
+	protected function getArrayableItems($items)
 	{
 		if ($items instanceof Collection)
 		{
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
@@ -12,9 +12,7 @@
     },
     "require-dev": {
         "jeremeamia/superclosure": "~1.0",
-        "patchwork/utf8": "1.1.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "patchwork/utf8": "1.1.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json
@@ -13,10 +13,6 @@
         "illuminate/support": "4.3.*",
         "symfony/translation": "2.5.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\Translation": ""
diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
@@ -15,9 +15,7 @@
         "symfony/translation": "2.5.*"
     },
     "require-dev": {
-        "illuminate/database": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/database": "4.3.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json
@@ -14,10 +14,6 @@
         "illuminate/filesystem": "4.3.*",
         "illuminate/support": "4.3.*"
     },
-    "require-dev": {
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
-    },
     "autoload": {
         "psr-0": {
             "Illuminate\\View": ""
diff --git a/src/Illuminate/Workbench/composer.json b/src/Illuminate/Workbench/composer.json
@@ -14,9 +14,7 @@
         "symfony/finder": "2.5.*"
     },
     "require-dev": {
-        "illuminate/console": "4.3.*",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "illuminate/console": "4.3.*"
     },
     "autoload": {
         "psr-0": {
