Merge branch 'master' of github.com:spryker/project into testing_envi…

…roment_travis
spryker · Nov 14, 2016 · c04a5c9 · c04a5c9
2 parents 4ac5e64 + 99dd316
commit c04a5c9
Show file tree

Hide file tree

Showing 30 changed files with 423 additions and 462 deletions.
diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,4 @@ npm-debug.log
 
 # tools
 composer.phar
+c3.php
diff --git a/c3.php b/c3.php
diff --git a/composer.json b/composer.json
@@ -3,8 +3,9 @@
   "description": "Project",
   "license": "MIT",
   "require": {
-    "spryker/spryker": "dev-testing_enviroment",
-    "php": ">=5.6",
+    "spryker/spryker": "dev-bugfix/php7-comp",
+
+    "php": ">=5.6.0",
     "braintree/braintree_php": "~3.15.0",
     "guzzlehttp/guzzle": "~6.2.1",
     "league/csv": "~8.1.0",
@@ -23,7 +24,7 @@
     "symfony/filesystem": "~2.6.13",
     "symfony/finder": "~2.6.13",
     "symfony/form": "~2.6.13",
-    "symfony/http-foundation": "~2.6.13",
+    "symfony/http-foundation": "~2.8.0",
     "symfony/http-kernel": "~2.6.13",
     "symfony/intl": "~2.8.8",
     "symfony/options-resolver": "~2.6.13",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,3 +74,4 @@ npm-debug.log

		# tools
		composer.phar
		c3.php