Merge pull request #351 from magento-ogre/PR_Branch

[Ogres] Bug fixes

Author: Kopylova,Olga(okopylova)

.travis.yml

@@ -4,7 +4,8 @@ php:
   - 5.6
 env:
   - TEST_SUITE=unit
-  - TEST_SUITE=integration
+  - TEST_SUITE=integration_part_1
+  - TEST_SUITE=integration_part_2
   - TEST_SUITE=integration_integrity
   - TEST_SUITE=static_phpcs
   - TEST_SUITE=static_annotation
@@ -32,7 +33,7 @@ before_script:
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   # Install MySQL 5.6, create DB for integration tests
   - >
-      sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
+      sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
       sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
       sudo apt-get autoremove;
       sudo apt-get autoclean;
@@ -50,10 +51,12 @@ script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
   # Integration tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
   # Integration integrity tests
   - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
   # Static tests [Code Style]
   - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

app/code/Magento/Backend/Block/Menu.php

@@ -455,28 +455,14 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             }
 
             $id = $this->getJsId($menuItem->getId());
-            if (count($menu) > 1 || $level != 1) {
-                $output .= '<li ' . $this->getUiId(
-                        $menuItem->getId()
-                    ) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
-                        $menuItem,
-                        $level
-                    ) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
-                    . '" role="menu-item">' . $this->_renderAnchor(
-                        $menuItem,
-                        $level
-                    ) . $this->_addSubMenu(
-                        $menuItem,
-                        $level,
-                        $limit,
-                        $id
-                    ) . '</li>';
+            $subMenu = $this->_addSubMenu($menuItem, $level, $limit, $id);
+            if (count($menu) > 1 || $level != 1 || $menuItem->getUrl() !== '#') {
+                $output .= '<li ' . $this->getUiId($menuItem->getId())
+                    . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
+                    . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
+                    . '" role="menu-item">' . $this->_renderAnchor($menuItem, $level) . $subMenu . '</li>';
             } else {
-                $output .= $this->_addSubMenu(
-                    $menuItem,
-                    $level,
-                    $limit,
-                    $id);
+                $output .= $subMenu;
             }
 
             $itemPosition++;

app/code/Magento/User/Model/UserValidationRules.php

@@ -29,11 +29,11 @@ class UserValidationRules
     public function addUserInfoRules(\Magento\Framework\Validator\Object $validator)
     {
         $userNameNotEmpty = new NotEmpty();
-        $userNameNotEmpty->setMessage(__('Please enter a user name.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $userNameNotEmpty->setMessage(__('User Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
         $firstNameNotEmpty = new NotEmpty();
-        $firstNameNotEmpty->setMessage(__('Please enter a first name.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $firstNameNotEmpty->setMessage(__('First Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
         $lastNameNotEmpty = new NotEmpty();
-        $lastNameNotEmpty->setMessage(__('Please enter a last name.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $lastNameNotEmpty->setMessage(__('Last Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
         $emailValidity = new EmailAddress();
         $emailValidity->setMessage(__('Please enter a valid email.'), \Zend_Validate_EmailAddress::INVALID);
 

bin/magento

@@ -5,10 +5,16 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Framework\AppInterface;
+
 try {
     require __DIR__ . '/../app/bootstrap.php';
     if (PHP_SAPI == 'cli') {
-        $application = new Magento\Framework\Console\Cli('Magento CLI');
+        // For Cli we are using our customized error handler
+        $handler = new \Magento\Framework\App\ErrorHandler();
+        set_error_handler([$handler, 'handler']);
+
+        $application = new Magento\Framework\Console\Cli('Magento CLI', AppInterface::VERSION);
         $application->run();
     }
 

composer.json

@@ -31,7 +31,7 @@
         "zendframework/zend-log": "2.4.0",
         "zendframework/zend-http": "2.4.0",
         "magento/zendframework1": "1.12.13",
-        "composer/composer": "1.0.0-alpha9",
+        "composer/composer": "1.0.0-alpha10",
         "monolog/monolog": "1.11.0",
         "oyejorge/less.php": "1.7.0.3",
         "tubalmartin/cssmin": "2.4.8-p4",
@@ -54,6 +54,7 @@
         "ext-curl": "*",
         "ext-iconv": "*",
         "ext-intl": "*",
+        "ext-xsl": "*",
         "sjparkinson/static-review": "~4.1",
         "fabpot/php-cs-fixer": "~1.2",
         "lusitanian/oauth": "~0.3"