Fix conflicts.

taylorotwell · taylorotwell · commit 234b3a850109 · 2014-05-02T16:28:33.000-05:00
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "symfony/http-kernel": "2.5.*",
         "symfony/process": "2.5.*",
         "symfony/routing": "2.5.*",
-        "symfony/security": "2.5.*",
+        "symfony/security-core": "2.5.*",
         "symfony/translation": "2.5.*"
     },
     "replace": {
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -476,7 +476,7 @@ protected function getConcrete($abstract)
 	 */
 	protected function missingLeadingSlash($abstract)
 	{
-		return is_string($abstract) && ! starts_with($abstract, '\\');
+		return is_string($abstract) && strpos($abstract, '\\') !== 0;
 	}
 
 	/**
diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/support": "4.2.*",
-        "symfony/security": "2.5.*"
+        "symfony/security-core": "2.5.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*"

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ protected function getConcrete($abstract)`
`476`	`476`	`*/`
`477`	`477`	`protected function missingLeadingSlash($abstract)`
`478`	`478`	`{`
`479`		`- return is_string($abstract) && ! starts_with($abstract, '\\');`
	`479`	`+ return is_string($abstract) && strpos($abstract, '\\') !== 0;`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`/**`