Merge branch '4.0'

taylorotwell · taylorotwell · commit f1c5a82c89a6 · 2013-06-08T13:06:36.000-05:00
diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
@@ -11,7 +11,7 @@ class CacheManager extends Manager {
 	 */
 	protected function createApcDriver()
 	{
-		return $this->repository(new ApcStore(new ApcWrapper));
+		return $this->repository(new ApcStore(new ApcWrapper, $this->getPrefix()));
 	}
 
 	/**
@@ -47,7 +47,7 @@ protected function createMemcachedDriver()
 
 		$memcached = $this->app['memcached.connector']->connect($servers);
 
-		return $this->repository(new MemcachedStore($memcached, $this->app['config']['cache.prefix']));
+		return $this->repository(new MemcachedStore($memcached, $this->getPrefix()));
 	}
 
 	/**
@@ -57,7 +57,7 @@ protected function createMemcachedDriver()
 	 */
 	protected function createWincacheDriver()
 	{
-		return $this->repository(new WinCacheStore($this->app['config']['cache.prefix']));
+		return $this->repository(new WinCacheStore($this->getPrefix()));
 	}
 
 	/**
@@ -69,7 +69,7 @@ protected function createRedisDriver()
 	{
 		$redis = $this->app['redis'];
 
-		return $this->repository(new RedisStore($redis, $this->app['config']['cache.prefix']));
+		return $this->repository(new RedisStore($redis, $this->getPrefix()));
 	}
 
 	/**
@@ -88,7 +88,7 @@ protected function createDatabaseDriver()
 		// is being used by multiple applications although this is very unlikely.
 		$table = $this->app['config']['cache.table'];
 
-		$prefix = $this->app['config']['cache.prefix'];
+		$prefix = $this->getPrefix();
 
 		return $this->repository(new DatabaseStore($connection, $encrypter, $table, $prefix));
 	}
@@ -105,6 +105,16 @@ protected function getDatabaseConnection()
 		return $this->app['db']->connection($connection);
 	}
 
+	/**
+	 * Get the cache "prefix" value.
+	 *
+	 * @return string
+	 */
+	public function getPrefix()
+	{
+		return $this->app['config']['cache.prefix'];
+	}
+
 	/**
 	 * Create a new cache repository with the given implementation.
 	 *
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
@@ -286,7 +286,7 @@ protected function getRootUrl($scheme)
 	 */
 	public function isValidUrl($path)
 	{
-		if (starts_with($path, array('#', '//'))) return true;
+		if (starts_with($path, array('#', '//', 'mailto:', 'tel:'))) return true;
 
 		return filter_var($path, FILTER_VALIDATE_URL) !== false;
 	}
diff --git a/src/Illuminate/Support/MessageBag.php b/src/Illuminate/Support/MessageBag.php
@@ -222,6 +222,16 @@ public function setFormat($format = ':message')
 		$this->format = $format;
 	}
 
+	/**
+	 * Determine if the message bag has any messages.
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+		return $this->any();
+	}
+
 	/**
 	 * Determine if the message bag has any messages.
 	 *

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class CacheManager extends Manager {`
`11`	`11`	`*/`
`12`	`12`	`protected function createApcDriver()`
`13`	`13`	`{`
`14`		`- return $this->repository(new ApcStore(new ApcWrapper));`
	`14`	`+ return $this->repository(new ApcStore(new ApcWrapper, $this->getPrefix()));`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/**`
`@@ -47,7 +47,7 @@ protected function createMemcachedDriver()`
`47`	`47`
`48`	`48`	`$memcached = $this->app['memcached.connector']->connect($servers);`
`49`	`49`
`50`		`- return $this->repository(new MemcachedStore($memcached, $this->app['config']['cache.prefix']));`
	`50`	`+ return $this->repository(new MemcachedStore($memcached, $this->getPrefix()));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -57,7 +57,7 @@ protected function createMemcachedDriver()`
`57`	`57`	`*/`
`58`	`58`	`protected function createWincacheDriver()`
`59`	`59`	`{`
`60`		`- return $this->repository(new WinCacheStore($this->app['config']['cache.prefix']));`
	`60`	`+ return $this->repository(new WinCacheStore($this->getPrefix()));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`@@ -69,7 +69,7 @@ protected function createRedisDriver()`
`69`	`69`	`{`
`70`	`70`	`$redis = $this->app['redis'];`
`71`	`71`
`72`		`- return $this->repository(new RedisStore($redis, $this->app['config']['cache.prefix']));`
	`72`	`+ return $this->repository(new RedisStore($redis, $this->getPrefix()));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
`@@ -88,7 +88,7 @@ protected function createDatabaseDriver()`
`88`	`88`	`// is being used by multiple applications although this is very unlikely.`
`89`	`89`	`$table = $this->app['config']['cache.table'];`
`90`	`90`
`91`		`- $prefix = $this->app['config']['cache.prefix'];`
	`91`	`+ $prefix = $this->getPrefix();`
`92`	`92`
`93`	`93`	`return $this->repository(new DatabaseStore($connection, $encrypter, $table, $prefix));`
`94`	`94`	`}`
`@@ -105,6 +105,16 @@ protected function getDatabaseConnection()`
`105`	`105`	`return $this->app['db']->connection($connection);`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ /**`
	`109`	`+ * Get the cache "prefix" value.`
	`110`	`+ *`
	`111`	`+ * @return string`
	`112`	`+ */`
	`113`	`+ public function getPrefix()`
	`114`	`+ {`
	`115`	`+ return $this->app['config']['cache.prefix'];`
	`116`	`+ }`
	`117`	`+`
`108`	`118`	`/**`
`109`	`119`	`* Create a new cache repository with the given implementation.`
`110`	`120`	`*`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ protected function getRootUrl($scheme)`
`286`	`286`	`*/`
`287`	`287`	`public function isValidUrl($path)`
`288`	`288`	`{`
`289`		`- if (starts_with($path, array('#', '//'))) return true;`
	`289`	`+ if (starts_with($path, array('#', '//', 'mailto:', 'tel:'))) return true;`
`290`	`290`
`291`	`291`	`return filter_var($path, FILTER_VALIDATE_URL) !== false;`
`292`	`292`	`}`