Permalink
Browse files

Published Magento 2 update as of 2/29/2012

- Added jQuery to Magento 2. It has not been made a main library yet, however all new features are developed using jQuery.
- Added support for new versions of testing tools - PHPUnit 3.6, PHPMD 1.3.0. Confirmed compatibility with latest PHPCS 1.3.2 and PHPCPD 1.3.5.
- Improved legacy tests:
-- Refactored Integrity_ClassesTest and Legacy_ClassesTest.
-- Implemented a tool for migrating factory names from 1.x to 2.x. The tool scans PHP-code and replaces the most "popular" cases.
-- Added tests for "//model" in config.xml files and "//*[@module]" in all xml files.
-- Implemented a test that verifies the absence of relocated directories.
-- Added a test against the obsolete Varien_Profiler.
- Bug fixes:
-- Fixed phpdoc for Mage_Core_Model_Design_Package.
-- Fixed static code analysis failures related to case-sensitivity.
-- Fixed several typos and minor mistakes.
-- Fixed integration test's failures due to specifics of xpath library version.
- Imported fresh features and bug fixes from Magento 1.x.
  • Loading branch information...
1 parent 68bdc66 commit 9de22232a890e87c416e4dbce945e09483f6e8ea @magento-team magento-team committed Mar 2, 2012
Showing 5,730 changed files with 48,625 additions and 15,554 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -14,7 +14,6 @@
/app/etc/local.xml
/app/etc/local.xml.*
/app/etc/modules/XEnterprise_Enabler.xml
-/app/locale/en_US_org
/downloader/.cache
/downloader/cache.cfg
/downloader/connect.cfg
View
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Core
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -397,7 +397,7 @@ public static function dispatchEvent($name, array $data = array())
*
* @link Mage_Core_Model_Config::getModelInstance
* @param string $modelClass
- * @param array $arguments
+ * @param array|object $arguments
* @return Mage_Core_Model_Abstract
*/
public static function getModel($modelClass = '', $arguments = array())
@@ -497,7 +497,7 @@ public static function helper($name)
}
/**
- * Retreive resource helper object
+ * Retrieve resource helper object
*
* @param string $moduleName
* @return Mage_Core_Model_Resource_Helper_Abstract
@@ -555,7 +555,8 @@ public static function app($code = '', $type = 'store', $options = array())
self::$_app = new Mage_Core_Model_App();
self::setRoot();
self::$_events = new Varien_Event_Collection();
- self::$_config = new Mage_Core_Model_Config($options);
+ self::setIsInstalled($options);
+ self::setConfigModel($options);
Magento_Profiler::start('self::app::init');
self::$_app->init($code, $type, $options);
@@ -577,7 +578,8 @@ public static function init($code = '', $type = 'store', $options = array(), $mo
try {
self::setRoot();
self::$_app = new Mage_Core_Model_App();
- self::$_config = new Mage_Core_Model_Config();
+ self::setIsInstalled($options);
+ self::setConfigModel($options);
if (!empty($modules)) {
self::$_app->initSpecified($code, $type, $options, $modules);
@@ -616,7 +618,8 @@ public static function run($code = '', $type = 'store', $options = array())
self::$_app->setResponse($options['response']);
}
self::$_events = new Varien_Event_Collection();
- self::$_config = new Mage_Core_Model_Config($options);
+ self::setIsInstalled($options);
+ self::setConfigModel($options);
self::$_app->run(array(
'scope_code' => $code,
'scope_type' => $type,
@@ -648,6 +651,40 @@ public static function run($code = '', $type = 'store', $options = array())
}
/**
+ * Set application isInstalled flag based on given options
+ *
+ * @param array $options
+ */
+ public static function setIsInstalled($options = array())
+ {
+ if (isset($options['is_installed']) && $options['is_installed']) {
+ self::$_isInstalled = true;
+ }
+ }
+
+ /**
+ * Set application Config model
+ *
+ * @param array $options
+ */
+ public static function setConfigModel($options = array())
+ {
+ if (isset($options['config_model']) && Magento_Autoload::getInstance()->classExists($options['config_model'])) {
+ $alternativeConfigModelName = $options['config_model'];
+ unset($options['config_model']);
+ $alternativeConfigModel = new $alternativeConfigModelName($options);
+ } else {
+ $alternativeConfigModel = null;
+ }
+
+ if (!is_null($alternativeConfigModel) && ($alternativeConfigModel instanceof Mage_Core_Model_Config)) {
+ self::$_config = $alternativeConfigModel;
+ } else {
+ self::$_config = new Mage_Core_Model_Config($options);
+ }
+ }
+
+ /**
* Retrieve application installation flag
*
* @param string|array $options
View
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Payment extends Mage_Core_Block_Template
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Placeform extends Mage_Core_Block_Template
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Redirect extends Mage_Core_Block_Template
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Helper_Data extends Mage_Payment_Helper_Data
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
abstract class Phoenix_Moneybookers_Model_Abstract extends Mage_Payment_Model_Method_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Acc extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Csi extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Did extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Dnk extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ebt extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ent extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gcb extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gir extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Idl extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Lsr extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Mae extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Npy extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Obt extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pli extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Psp extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pwy extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Sft extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_So2 extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Wlt extends Phoenix_Moneybookers_Model_Abstract
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_MoneybookersController extends Mage_Adminhtml_Controller_Action
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_ProcessingController extends Mage_Core_Controller_Front_Action
@@ -21,7 +21,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
Oops, something went wrong.

0 comments on commit 9de2223

Please sign in to comment.