Merge branch '4.1'

taylorotwell · taylorotwell · commit 326093eba4c2 · 2014-05-08T08:14:17.000-05:00
diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
@@ -73,7 +73,7 @@ public function hasColumn($table, $column)
 	 * @param  string  $table
 	 * @return array
 	 */
-	protected function getColumnListing($table)
+	public function getColumnListing($table)
 	{
 		$table = $this->connection->getTablePrefix().$table;
 
diff --git a/src/Illuminate/Database/Schema/MySqlBuilder.php b/src/Illuminate/Database/Schema/MySqlBuilder.php
@@ -25,7 +25,7 @@ public function hasTable($table)
 	 * @param  string  $table
 	 * @return array
 	 */
-	protected function getColumnListing($table)
+	public function getColumnListing($table)
 	{
 		$sql = $this->grammar->compileColumnExists();
 
diff --git a/src/Illuminate/Queue/Connectors/SqsConnector.php b/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -13,9 +13,7 @@ class SqsConnector implements ConnectorInterface {
 	 */
 	public function connect(array $config)
 	{
-		$sqsConfig = array_only($config, array('key', 'secret', 'region', 'default_cache_config'));
-
-		$sqs = SqsClient::factory($sqsConfig);
+		$sqs = SqsClient::factory($config);
 
 		return new SqsQueue($sqs, $config['queue']);
 	}
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1129,7 +1129,7 @@ protected function validateMimes($attribute, $value, $parameters)
 	{
 		if ( ! $value instanceof File)
 		{
-			return true;
+			return false;
 		}
 
 		// The Symfony File class should do a decent job of guessing the extension

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function hasColumn($table, $column)`
`73`	`73`	`* @param string $table`
`74`	`74`	`* @return array`
`75`	`75`	`*/`
`76`		`- protected function getColumnListing($table)`
	`76`	`+ public function getColumnListing($table)`
`77`	`77`	`{`
`78`	`78`	`$table = $this->connection->getTablePrefix().$table;`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function hasTable($table)`
`25`	`25`	`* @param string $table`
`26`	`26`	`* @return array`
`27`	`27`	`*/`
`28`		`- protected function getColumnListing($table)`
	`28`	`+ public function getColumnListing($table)`
`29`	`29`	`{`
`30`	`30`	`$sql = $this->grammar->compileColumnExists();`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ class SqsConnector implements ConnectorInterface {`
`13`	`13`	`*/`
`14`	`14`	`public function connect(array $config)`
`15`	`15`	`{`
`16`		`- $sqsConfig = array_only($config, array('key', 'secret', 'region', 'default_cache_config'));`
`17`		`-`
`18`		`- $sqs = SqsClient::factory($sqsConfig);`
	`16`	`+ $sqs = SqsClient::factory($config);`
`19`	`17`
`20`	`18`	`return new SqsQueue($sqs, $config['queue']);`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,7 @@ protected function validateMimes($attribute, $value, $parameters)`
`1129`	`1129`	`{`
`1130`	`1130`	`if ( ! $value instanceof File)`
`1131`	`1131`	`{`
`1132`		`- return true;`
	`1132`	`+ return false;`
`1133`	`1133`	`}`
`1134`	`1134`
`1135`	`1135`	`// The Symfony File class should do a decent job of guessing the extension`