Prepare release beta3

oroinc · Nov 11, 2013 · db9d04e · db9d04e
2 parents efddded + fda2fa4
commit db9d04e
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 102 deletions.
diff --git a/app/OroRequirements.php b/app/OroRequirements.php
@@ -3,13 +3,17 @@
 require_once __DIR__ . '/SymfonyRequirements.php';
 
 use Symfony\Component\Process\ProcessBuilder;
+use Symfony\Component\Intl\Intl;
 
 /**
  * This class specifies all requirements and optional recommendations that are necessary to run the Oro Application.
  */
 class OroRequirements extends SymfonyRequirements
 {
     const REQUIRED_PHP_VERSION = '5.4.4';
+    const REQUIRED_GD_VERSION = '2.0';
+    const REQUIRED_CURL_VERSION = '7.0';
+    const REQUIRED_ICU_VERSION = '4.4';
 
     public function __construct()
     {
@@ -19,10 +23,14 @@ public function __construct()
         $jreExists = $jreExists->getProcess();
 
         $jreExists->run();
+        while ($jreExists->isRunning()) {
+            // waiting for process to finish
+        }
 
         $phpVersion  = phpversion();
-        $gdVersion   = defined('GD_VERSION') ? (float) GD_VERSION : null;
+        $gdVersion   = defined('GD_VERSION') ? GD_VERSION : null;
         $curlVersion = function_exists('curl_version') ? curl_version() : null;
+        $icuVersion  = Intl::getIcuVersion();
         $jreExists   = strpos($jreExists->getErrorOutput(), 'java version') !== false;
 
         $this->addOroRequirement(
@@ -35,9 +43,9 @@ public function __construct()
         );
 
         $this->addOroRequirement(
-            null !== $gdVersion && $gdVersion >= 2.0,
-            'GD extension must be at least 2.0',
-            'Install and enable the <strong>JSON</strong> extension.'
+            null !== $gdVersion && version_compare($gdVersion, self::REQUIRED_GD_VERSION, '>='),
+            'GD extension must be at least ' . self::REQUIRED_GD_VERSION,
+            'Install and enable the <strong>GD</strong> extension at least ' . self::REQUIRED_GD_VERSION . ' version'
         );
 
         $this->addOroRequirement(
@@ -46,16 +54,28 @@ function_exists('mcrypt_encrypt'),
             'Install and enable the <strong>Mcrypt</strong> extension.'
         );
 
+        $this->addOroRequirement(
+            class_exists('Locale'),
+            'intl extension should be available',
+            'Install and enable the <strong>intl</strong> extension.'
+        );
+
+        $this->addOroRequirement(
+            null !== $icuVersion && version_compare($icuVersion, self::REQUIRED_ICU_VERSION, '>='),
+            'icu library must be at least ' . self::REQUIRED_ICU_VERSION,
+            'Install and enable the <strong>icu</strong> library at least ' . self::REQUIRED_ICU_VERSION . ' version'
+        );
+
         $this->addRecommendation(
             class_exists('SoapClient'),
             'SOAP extension should be installed (API calls)',
             'Install and enable the <strong>SOAP</strong> extension.'
         );
 
         $this->addRecommendation(
-            null !== $curlVersion && (float) $curlVersion['version'] >= 7.0,
-            'cURL extension must be at least 7.0',
-            'Install and enable the <strong>cURL</strong> extension.'
+            null !== $curlVersion && version_compare($curlVersion['version'], self::REQUIRED_CURL_VERSION, '>='),
+            'cURL extension must be at least ' . self::REQUIRED_CURL_VERSION,
+            'Install and enable the <strong>cURL</strong> extension at least ' . self::REQUIRED_CURL_VERSION . ' version'
         );
 
         // Windows specific checks
@@ -191,4 +211,4 @@ protected function getBytes($val)
 
 class OroRequirement extends Requirement
 {
-}
+}
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -38,32 +38,11 @@ twig:
         ws:
             port:             "%websocket_port%"
             host:             "%websocket_host%"
-    form:
-        resources:
-            - 'OroUIBundle:Form:fields.html.twig'
-            - 'OroFormBundle:Form:fields.html.twig'
-            - 'OroTranslationBundle:Form:fields.html.twig'
-            - 'OroAddressBundle:Include:fields.html.twig'
-            - 'OroOrganizationBundle:Form:fields.html.twig'
-            - 'OroSecurityBundle:Form:fields.html.twig'
 
 # Assetic Configuration
 assetic:
     debug:                    false
     use_controller:           false
-    bundles:
-        - OroAsseticBundle
-        - OroAddressBundle
-        - OroUIBundle
-        - OroUserBundle
-        - OroGridBundle
-        - OroFilterBundle
-        - OroNavigationBundle
-        - OroWindowsBundle
-        - OroSegmentationTreeBundle
-        - OroEntityExtendBundle
-        - OroSecurityBundle
-        - JDareClankBundle
 
     #java: /usr/bin/java
     filters:
@@ -106,6 +85,7 @@ doctrine:
                 password:     "%database_password%"
                 charset:      UTF8
         types:
+            date:     Oro\Bundle\LocaleBundle\DoctrineExtensions\DBAL\Types\UTCDateType
             datetime: Oro\Bundle\LocaleBundle\DoctrineExtensions\DBAL\Types\UTCDateTimeType
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
@@ -118,6 +98,8 @@ doctrine:
 swiftmailer:
     transport:                "%mailer_transport%"
     host:                     "%mailer_host%"
+    port:                     "%mailer_port%"
+    encryption:               "%mailer_encryption%"
     username:                 "%mailer_user%"
     password:                 "%mailer_password%"
     spool:                    { type: memory }
@@ -160,8 +142,8 @@ be_simple_soap:
         soap:
             namespace:        http://symfony.loc/Api/1.0/
             binding:          rpc-literal
-            resource:         "%kernel.root_dir%/../app/config/soap.yml"
-            resource_type:    yml
+            resource:         .
+            resource_type:    oro_soap
 
 stof_doctrine_extensions:
     default_locale: en
@@ -237,41 +219,14 @@ lexik_maintenance:
 #
 # ORO Bundles config
 #
-oro_search:
-    engine:                   orm
-    realtime_update:          true
-
-oro_ui:
-    settings:
-        application_name:
-            value:            "Oro Platform"
-        application_title:
-            value:            "Oro Business Application Platform"
-
-oro_translation:
-    js_translation:
-        # order of domains reflects messages fallback
-        domains:              [jsmessages, validators]
-
-oro_entity_extend:
-    backup:         "%kernel.root_dir%/entities/Extend/Backup/"
-
 oro_require_js:
-    config:
-        # @see http://requirejs.org/docs/api.html#config
-        waitSeconds: 0
-#        enforceDefine: true
-#        scriptType: 'text/javascript'
-    build_path: "js/oro.min.js"
-    building_timeout: 3600
+    build_path:               "js/oro.min.js"
+    building_timeout:         3600
     build:
         # @see https://github.com/jrburke/r.js/blob/master/build/example.build.js
-        optimize: "uglify2"
         preserveLicenseComments: true
-#        generateSourceMaps: true
-#        useSourceUrl: true
     # it's better to set "node" as js_engine, if nodejs is installed
-    js_engine: "java -Xss10m -Xms512m -Xmx1024m -cp %kernel.root_dir%/Resources/java/js.jar org.mozilla.javascript.tools.shell.Main"
+    js_engine:                "java -Xss10m -Xms512m -Xmx1024m -cp %kernel.root_dir%/Resources/java/js.jar org.mozilla.javascript.tools.shell.Main"
 
 oro_help:
     defaults:

diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -32,3 +32,12 @@ monolog:
     handlers:
         main:
             level: error
+
+oro_assetic:
+    js_debug:       ~
+    js_debug_all:   false
+    css_debug:      ~
+    css_debug_all:  false
+
+oro_require_js:
+    js_engine: ~
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -7,6 +7,8 @@ parameters:
 
     mailer_transport:       mail
     mailer_host:            127.0.0.1
+    mailer_port:            ~
+    mailer_encryption:      ~
     mailer_user:            ~
     mailer_password:        ~
 

diff --git a/app/config/parameters_test.yml.dist b/app/config/parameters_test.yml.dist
@@ -7,6 +7,8 @@ parameters:
 
     mailer_transport:       smtp
     mailer_host:            127.0.0.1
+    mailer_port:            ~
+    mailer_encryption:      ~
     mailer_user:            ~
     mailer_password:        ~
 
@@ -18,4 +20,4 @@ parameters:
 
     locale:                 en
     secret:                 ThisTokenIsNotSoSecretChangeIt
-    installed:              true
+    installed:              ~
diff --git a/app/config/soap.yml b/app/config/soap.yml
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -13,28 +13,27 @@
     syntaxCheck                 = "false"
     bootstrap                   = "bootstrap.php.cache" >
 
+    <logging>
+      <log type="junit" target="../build/logs/phpunit.xml"/>
+    </logging>
+
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory suffix="Test.php">../src/*/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Functional</directory>
             <directory suffix="Test.php">../src/*/Bundle/*Bundle/Tests/Unit</directory>
-            <directory suffix="Test.php">../src/*/*Bundle/Tests/Functional</directory>
             <directory suffix="Test.php">../src/*/Bundle/*Bundle/Tests/Functional</directory>
         </testsuite>
         <testsuite name="Project Unit Tests">
-            <directory suffix="Test.php">../src/*/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Unit</directory>
             <directory suffix="Test.php">../src/*/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
         <testsuite name="Project Functional Tests">
-            <directory suffix="Test.php">../src/*/*Bundle/Tests/Functional</directory>
+            <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Functional</directory>
             <directory suffix="Test.php">../src/*/Bundle/*Bundle/Tests/Functional</directory>
         </testsuite>
-        <testsuite name="Project Performance Tests">
-            <directory suffix="Perf.php">../src/*/*Bundle/Tests/Performance</directory>
-            <directory suffix="Perf.php">../src/*/Bundle/*Bundle/Tests/Performance</directory>
-        </testsuite>
         <testsuite name="Project Selenium Tests">
-            <directory suffix="Test.php">../src/*/*Bundle/Tests/Selenium</directory>
-            <directory suffix="Test.php">../src/*/Bundle/*Bundle/Tests/Selenium</directory>
+            <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Selenium</directory>
         </testsuite>
         <testsuite name="Project Behat Tests">
             <directory suffix="Test.php">../src/Oro*/src/Oro*/Bundle/*Bundle/Tests/Behat</directory>
@@ -55,31 +54,40 @@
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM2_BROWSER" value="phantomjs"/>
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_TESTS_URL" value="http://localhost.com"/>
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_TESTS_URL_COVERAGE" value="http://localhost.com/bundles/acmetests/scripts/phpunit_coverage.php"/>
-        <const name="MAX_EXECUTION_TIME" value="15000"/>
-        <const name="TIME_OUT" value="1000"/>
+        <const name="MAX_EXECUTION_TIME" value="120000"/>
+        <const name="TIME_OUT" value="5000"/>
+        <const name="viewportWIDTH" value="1900"/>
+        <const name="viewportHEIGHT" value="1080"/>
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_PATH_LOGS" value="app/log"/>
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_LOGIN" value="admin"/>
         <const name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_PASS" value="admin"/>
     </php>
     <listeners>
-        <listener class="TestListener" file="src/Oro/Bundle/TestFrameworkBundle/Test/TestListener.php">
+        <listener class="TestListener" file="src/Oro/src/Oro/Bundle/TestFrameworkBundle/Test/TestListener.php">
             <arguments>
                 <string>app/logs</string>
             </arguments>
         </listener>
     </listeners>
     <filter>
-        <whitelist>
+        <whitelist processUncoveredFilesFromWhitelist="true" addUncoveredFilesFromWhitelist="true">
             <directory>../src</directory>
             <exclude>
                 <directory>../vendor</directory>
-                <directory>../src/*/*Bundle/DataFixtures</directory>
+                <directory>../src/*/tests</directory>
+                <directory>../src/*/src/*/Bundle/TestFrameworkBundle</directory>
                 <directory>../src/*/Bundle/*Bundle/DataFixtures</directory>
-                <directory>../src/*/*Bundle/Resources</directory>
-                <directory>../src/*/*Bundle/Tests</directory>
                 <directory>../src/*/Bundle/*Bundle/Resources</directory>
                 <directory>../src/*/Bundle/*Bundle/Tests</directory>
                 <directory>../src/*/Bundle/*Bundle/vendor</directory>
+                <directory>../src/*/src/*/Bundle/*Bundle/DataFixtures</directory>
+                <directory>../src/*/src/*/Bundle/*Bundle/Resources</directory>
+                <directory>../src/*/src/*/Bundle/*Bundle/Tests</directory>
+                <directory>../src/*/src/*/Bundle/*Bundle/vendor</directory>
+                <directory>../src/*/src/*/Bundle/*Bundle/DependencyInjection</directory>
+                <directory suffix="Bundle.php">../src/*/src/*/Bundle/*Bundle</directory>
+                <directory>../src/*/Bundle/*Bundle/DependencyInjection</directory>
+                <directory suffix="Bundle.php">../src/*/Bundle/*Bundle</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
          }
     },
     "require": {
-        "oro/platform": "dev-master"
+        "oro/platform": "1.0.0-beta3"
     },
     "scripts": {
         "post-install-cmd": [

diff --git a/install.bat b/install.bat
@@ -5,21 +5,22 @@ if "%1" NEQ "" (
 )
 
 php app/console-framework oro:entity-extend:clear --env %ENV% || goto :error
-php app/console doctrine:schema:drop --force --full-database --env %ENV% || goto :error
+php app/console-framework doctrine:schema:drop --force --full-database --env %ENV% || goto :error
 php app/console-framework doctrine:schema:create --env %ENV% || goto :error
-php app/console-framework doctrine:fixture:load --no-debug --no-interaction --env %ENV% || goto :error
-php app/console-framework doctrine:fixtures:load --fixtures=vendor/oro/platform/src/Oro/Bundle/TestFrameworkBundle/Fixtures/ --append --no-debug --no-interaction --env %ENV% || goto :error
-php app/console-framework oro:navigation:init --env %ENV% || goto :error
 php app/console-framework oro:entity-config:init --env %ENV% || goto :error
 php app/console-framework oro:entity-extend:init --env %ENV% || goto :error
 php app/console-framework oro:entity-extend:update-config --env %ENV% || goto :error
 php app/console-framework doctrine:schema:update --env %ENV% --force || goto :error
+php app/console-framework doctrine:fixture:load --append --no-debug --no-interaction --env %ENV% || goto :error
+php app/console-framework doctrine:fixtures:load --fixtures=src/Oro/src/Oro/Bundle/TestFrameworkBundle/Fixtures/ --append --no-debug --no-interaction --env %ENV% || goto :error
+php app/console-framework oro:navigation:init --env %ENV% || goto :error
 php app/console-framework oro:search:create-index --env %ENV% || goto :error
+php app/console-framework oro:localization:dump --env $ENV || goto :error
 php app/console-framework assets:install web --env %ENV% || goto :error
-php app/console assetic:dump --env %ENV% || goto :error
-php app/console oro:assetic:dump --env %ENV%|| goto :error
-php app/console oro:translation:dump --env %ENV% || goto :error
-php app/console oro:requirejs:build --env %ENV% || goto :error
+php app/console-framework assetic:dump --env %ENV% || goto :error
+php app/console-framework oro:assetic:dump --env %ENV%|| goto :error
+php app/console-framework oro:translation:dump --env %ENV% || goto :error
+php app/console-framework oro:requirejs:build --env %ENV% || goto :error
 goto :EOF
 
 :error

diff --git a/install.sh b/install.sh
@@ -8,14 +8,15 @@ fi
 php app/console-framework oro:entity-extend:clear --env $ENV
 php app/console-framework doctrine:schema:drop --force --full-database --env $ENV
 php app/console-framework doctrine:schema:create --env $ENV
-php app/console-framework doctrine:fixture:load --no-debug --no-interaction --env $ENV
-php app/console-framework doctrine:fixtures:load --fixtures=vendor/oro/platform/src/Oro/Bundle/TestFrameworkBundle/Fixtures/ --append --no-debug --no-interaction --env $ENV
-php app/console-framework oro:navigation:init --env $ENV
 php app/console-framework oro:entity-config:init --env $ENV
 php app/console-framework oro:entity-extend:init --env $ENV
 php app/console-framework oro:entity-extend:update-config --env $ENV
 php app/console-framework doctrine:schema:update --env $ENV --force
+php app/console-framework doctrine:fixture:load --append --no-debug --no-interaction --env $ENV
+php app/console-framework doctrine:fixtures:load --fixtures=src/Oro/src/Oro/Bundle/TestFrameworkBundle/Fixtures/ --append --no-debug --no-interaction --env $ENV
+php app/console-framework oro:navigation:init --env $ENV
 php app/console-framework oro:search:create-index --env $ENV
+php app/console-framework oro:localization:dump --env $ENV
 php app/console-framework assets:install web --env $ENV
 php app/console-framework assetic:dump --env $ENV
 php app/console-framework oro:assetic:dump --env $ENV