MAGETWO-32948: Contribution to Mainline of Sprint 22 Work

Olga Kopylova · Olga Kopylova · commit a172ece089b7 · 2015-02-05T01:10:56.000-06:00
- fixed unit test
- fixed copyright
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/AddDatabaseTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/AddDatabaseTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/ConsoleControllerTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/ConsoleControllerTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/CreateAdminAccountTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/CreateAdminAccountTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/CustomizeYourStoreTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/CustomizeYourStoreTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/DatabaseCheckTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/DatabaseCheckTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/IndexTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/IndexTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/InstallTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/InstallTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/LicenseTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/LicenseTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/NavigationTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/NavigationTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/ReadinessCheckTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/ReadinessCheckTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/SuccessTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/SuccessTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/WebConfigurationTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/WebConfigurationTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Controller;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountFactoryTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/FilePermissionsTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/FilePermissionsTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/Installer/ProgressFactoryTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/Installer/ProgressFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model\Installer;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/Installer/ProgressTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/Installer/ProgressTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model\Installer;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/InstallerFactoryTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/InstallerFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/LicenseTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/LicenseTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/ListsTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/ListsTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/NavigationTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/NavigationTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/PhpInformationTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/PhpInformationTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/WebLoggerTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/WebLoggerTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Model;
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Mvc/Bootstrap/InitParamListenerTest.php b/dev/tests/unit/testsuite/Magento/Setup/Mvc/Bootstrap/InitParamListenerTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Mvc\Bootstrap;
diff --git a/setup/src/Magento/Setup/Model/WebLogger.php b/setup/src/Magento/Setup/Model/WebLogger.php
@@ -120,7 +120,7 @@ private function writeToFile($message)
      */
     public function get()
     {
-        $fileContents = explode('\n', $this->directory->readFile($this->logFile));
+        $fileContents = explode(PHP_EOL, $this->directory->readFile($this->logFile));
         return $fileContents;
     }
 
