Merge pull request #4 from orocommerce/commerce-1.0.0-beta.3.0

Commerce 1.0.0 beta.3.0

.gitignore

@@ -5,12 +5,14 @@
 /node_modules
 /composer.phar
 composer.lock
+behat.yml
 /build/logs/*
 /vendor
 node_modules/
 /cov
 /web/bundles
 /web/css
+/web/images
 /web/js
 /web/uploads/users/*
 /web/media/cache
@@ -19,6 +21,7 @@ node_modules/
 /app/karma.conf.js
 /app/config/parameters.yml
 /app/config/parameters_test.yml
+behat.yml
 *~
 
 /app/SymfonyRequirements.php

README.md

@@ -11,8 +11,8 @@ OroCommerce can be customized and extended to fit any B2B commerce needs.
 
 OroCommerce is a Symfony 2 based application with the following requirements:
 
-* PHP 5.4.9 or above
-* PHP 5.4.9 or above with command line interface
+* PHP 5.5.9 or above
+* PHP 5.5.9 or above with command line interface
 * PHP Extensions
     * GD
     * Mcrypt

app/AppKernel.php

@@ -9,7 +9,7 @@ class AppKernel extends OroKernel
     public function registerBundles()
     {
         $bundles = array(
-        // bundles
+            // bundles
         );
 
         if ('dev' === $this->getEnvironment()) {
@@ -22,6 +22,7 @@ public function registerBundles()
 
         if ('test' === $this->getEnvironment()) {
             $bundles[] = new Oro\Bundle\TestFrameworkBundle\OroTestFrameworkBundle();
+            $bundles[] = new Oro\Bundle\FrontendTestFrameworkBundle\OroFrontendTestFrameworkBundle();
         }
 
         return array_merge(parent::registerBundles(), $bundles);

app/OroRequirements.php

@@ -13,7 +13,7 @@
  */
 class OroRequirements extends SymfonyRequirements
 {
-    const REQUIRED_PHP_VERSION  = '5.4.9';
+    const REQUIRED_PHP_VERSION  = '5.5.9';
     const REQUIRED_GD_VERSION   = '2.0';
     const REQUIRED_CURL_VERSION = '7.0';
     const REQUIRED_ICU_VERSION  = '3.8';

app/check.php

@@ -6,13 +6,13 @@
 $symfonyRequirements = new SymfonyRequirements();
 $iniPath = $symfonyRequirements->getPhpIniConfigPath();
 
-echo_title('Symfony2 Requirements Checker');
+echo_title('Symfony Requirements Checker');
 
 echo '> PHP is using the following php.ini file:'.PHP_EOL;
 if ($iniPath) {
     echo_style('green', '  '.$iniPath);
 } else {
-    echo_style('warning', '  WARNING: No configuration file (php.ini) used by PHP!');
+    echo_style('yellow', '  WARNING: No configuration file (php.ini) used by PHP!');
 }
 
 echo PHP_EOL.PHP_EOL;
@@ -42,9 +42,9 @@
 }
 
 if ($checkPassed) {
-    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+    echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
 } else {
-    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
 
     echo_title('Fix the following mandatory requirements', 'red');
 

app/config/config_test.yml

@@ -3,6 +3,9 @@ imports:
     - { resource: parameters_test.yml }
     - { resource: security_test.yml }
 
+parameters:
+    doctrine.dbal.connection_factory.class: 'Oro\Component\Testing\Doctrine\PersistentConnectionFactory'
+
 framework:
     test: ~
     session:

app/config/parameters_test.yml.dist

@@ -4,7 +4,7 @@ parameters:
     database_port:          ~
     database_name:          b2b_dev_test
     database_user:          root
-    database_password:      root
+    database_password:      ~
 
     mailer_transport:       smtp
     mailer_host:            127.0.0.1
@@ -31,4 +31,3 @@ parameters:
     installed:              ~
     assets_version:         ~
     assets_version_strategy: time_hash
-

behat.yml.dist

@@ -0,0 +1,13 @@
+imports:
+  - ../../package/platform/src/Oro/Bundle/TestFrameworkBundle/Resources/config/behat.yml.dist
+
+default: &default
+    extensions:
+        Behat\MinkExtension:
+            base_url: 'http://dev-commerce.local/'
+
+selenium2:
+    <<: *default
+    extensions:
+        Behat\MinkExtension:
+            base_url: 'http://dev-commerce.local/'

composer.json

@@ -14,11 +14,19 @@
     }
   },
   "require": {
-    "php": ">=5.4.9",
-    "oro/commerce": "1.0.0-beta.2"
+    "php": ">=5.5.9",
+    "oro/commerce": "1.0.0-beta.3"
   },
   "require-dev": {
-    "sensio/generator-bundle": "2.5.3"
+    "sensio/generator-bundle": "2.5.3",
+    "behat/behat": "3.1.0",
+    "behat/mink-extension": "^2.0",
+    "behat/mink-selenium2-driver": "1.*",
+    "behat/symfony2-extension": "2.1.1",
+    "nelmio/alice": "^2.1",
+    "phpunit/phpunit": "4.8.*",
+    "johnkary/phpunit-speedtrap": "1.0.*",
+    "mybuilder/phpunit-accelerator": "1.1.*"
   },
   "config": {
     "component-dir": "web/bundles/components"
@@ -51,7 +59,6 @@
     }
   },
   "repositories": [
-
     {
       "type": "composer",
       "url": "https://packagist.orocrm.com"