2.0.0.0-dev33

* Improved Themes functionality to meet the following requirements:
  * Magento instance doesn’t crash in case there’re no themes at all
  * Features like selection of themes in system configuration, custom theme selection in Custom Design, CMS pages, Products and Categories can work without themes. They use base view files only.
  * Virtual themes work in the same way as the non-virtual (which are present in file system) though they additionally have inheritance property. Changes were made in theme switcher, in fallback mechanism, in widgets etc.
  * Non-virtual themes are being added to DB during installation
  * Application framework uses theme id as identifier instead of theme code
* Refactored a variety of report grids in backend (admin) to make them configurable through layout, rather than hard-coded.
* Removed obsolete modules:
  * `Mage_XmlConnect`
  * `Mage_Dataflow`
* Significantly changed Logging subsystem:
  * `Mage_Core_Model_Logger` class is responsible for logging
  * Changes are made to comply with DI paradigm
  * Custom logger in `Mage_Backend_Menu` subsystem is removed due to usage of regular one
* Changes made in autoload process
  * Fixed autoload to prevent `class_exists()` from causing fatal error
  * The `Magento_Autoload` library was divided into 2 classes: `Magento_Autoload_IncludePath` is responsible for loading from include path, `Magento_Autoload_ClassMap` from a class map. Stacked "class map" loader on top of "include path" loader in application bootstrap.
* Implemented new jQuery form widget. Its responsibility is to prepare form for submission (change form attributes if needed)
  * Replaced usage of different instances of `varienForm` with a new form widget (`productForm`, `categoryForm`, instances of type "onclick declaration", "as child component", "instantiation only")
  * Replaced prototype validation with jQuery analog
  * Additionally implemented form widget in different modules (CMS, Customer, Backend, Sitemap, DesignEditor, Tags, SystemEmail, Newsletters, ImportExport, Connect, Authorize.net)
* Minor improvements
  * Fixed css styles for validation messages in different parts of the system
  * Removed usage of `jquery-ui-1.8.21.custom.css`
  * Updated versions of jQuery and jQuery-UI on backend
  * Updated Magento trademark and copyright labels at the bottom of pages: changed legal entity name to X.Commerce, Inc, made translation engine pick them up
  * Improvements made in indexers to stabilize tests. Fixed wrong initialization order of indexers that sometimes caused failure of reindexing all at once
* Bugfixes:
  * Set correct order's data change state during voiding the order
  * Set translator to pick up status labels in drop-down in "Shopping cart price rule" admin grid
  * Fixed an issue in console installer that initialized application in such a way, that it could not load certain event area.
  * Fixed incorrect loader image source in backend during new tax rule creation
  * Fixed JS error in IE with creating products via floating toolbar
  * Fixed image save url during uploading product's images
  * Added permission check for editing shipping and billing addresses during viewing the order
  * Changed saving of order comments from backend. Comment is saved even without status change
  * Added additional validation into `quickCreateAction` of `Mage_Adminhtml_Catalog_ProductController` to prevent saving new product with any id using firebug
  * Fixed JS errors in Authorize.net Direct Post submodule
  * Fixed JS errors in split button on creating product
  * Fixed errors in poll's list template in backend

Author: magento-team

.gitignore

@@ -8,7 +8,6 @@ atlassian*
 /index.php
 /nbproject
 /sitemap
-/staging
 /.htaccess.orig
 /.idea
 /app/config_sandbox
@@ -29,7 +28,6 @@ atlassian*
 /pub/media/*
 /pub/media/customer/*
 /pub/media/downloadable/*
-/pub/media/xmlconnect/*
 /var/*
 dev/api-tests/config.php
 dev/api-tests/integration/tmp/*

CHANGELOG.markdown

@@ -1,3 +1,46 @@
+2.0.0.0-dev33
+=============
+* Improved Themes functionality to meet the following requirements:
+  * Magento instance doesn’t crash in case there’re no themes at all
+  * Features like selection of themes in system configuration, custom theme selection in Custom Design, CMS pages, Products and Categories can work without themes. They use base view files only.
+  * Virtual themes work in the same way as the non-virtual (which are present in file system) though they additionally have inheritance property. Changes were made in theme switcher, in fallback mechanism, in widgets etc.
+  * Non-virtual themes are being added to DB during installation
+  * Application framework uses theme id as identifier instead of theme code
+* Refactored a variety of report grids in backend (admin) to make them configurable through layout, rather than hard-coded.
+* Removed obsolete modules:
+  * `Mage_XmlConnect`
+  * `Mage_Dataflow`
+* Significantly changed Logging subsystem:
+  * `Mage_Core_Model_Logger` class is responsible for logging
+  * Changes are made to comply with DI paradigm
+  * Custom logger in `Mage_Backend_Menu` subsystem is removed due to usage of regular one
+* Changes made in autoload process
+  * Fixed autoload to prevent `class_exists()` from causing fatal error
+  * The `Magento_Autoload` library was divided into 2 classes: `Magento_Autoload_IncludePath` is responsible for loading from include path, `Magento_Autoload_ClassMap` from a class map. Stacked "class map" loader on top of "include path" loader in application bootstrap.
+* Implemented new jQuery form widget. Its responsibility is to prepare form for submission (change form attributes if needed)
+  * Replaced usage of different instances of `varienForm` with a new form widget (`productForm`, `categoryForm`, instances of type "onclick declaration", "as child component", "instantiation only")
+  * Replaced prototype validation with jQuery analog
+  * Additionally implemented form widget in different modules (CMS, Customer, Backend, Sitemap, DesignEditor, Tags, SystemEmail, Newsletters, ImportExport, Connect, Authorize.net)
+* Minor improvements
+  * Fixed css styles for validation messages in different parts of the system
+  * Removed usage of `jquery-ui-1.8.21.custom.css`
+  * Updated versions of jQuery and jQuery-UI on backend
+  * Updated Magento trademark and copyright labels at the bottom of pages: changed legal entity name to X.Commerce, Inc, made translation engine pick them up
+  * Improvements made in indexers to stabilize tests. Fixed wrong initialization order of indexers that sometimes caused failure of reindexing all at once
+* Bugfixes:
+  * Set correct order's data change state during voiding the order
+  * Set translator to pick up status labels in drop-down in "Shopping cart price rule" admin grid
+  * Fixed an issue in console installer that initialized application in such a way, that it could not load certain event area.
+  * Fixed incorrect loader image source in backend during new tax rule creation
+  * Fixed JS error in IE with creating products via floating toolbar
+  * Fixed image save url during uploading product's images
+  * Added permission check for editing shipping and billing addresses during viewing the order
+  * Changed saving of order comments from backend. Comment is saved even without status change
+  * Added additional validation into `quickCreateAction` of `Mage_Adminhtml_Catalog_ProductController` to prevent saving new product with any id using firebug
+  * Fixed JS errors in Authorize.net Direct Post submodule
+  * Fixed JS errors in split button on creating product
+  * Fixed errors in poll's list template in backend
+
 2.0.0.0-dev32
 =============
 * Improved product edit workflow:

app/Mage.php

@@ -20,7 +20,7 @@
  *
  * @category   Mage
  * @package    Mage_Core
- * @copyright  Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright  Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -170,7 +170,7 @@ public static function getVersionInfo()
             'revision'  => '0',
             'patch'     => '0',
             'stability' => 'dev',
-            'number'    => '32',
+            'number'    => '33',
         );
     }
 
@@ -681,7 +681,6 @@ public static function app($code = '', $type = 'store', $options = array())
             Magento_Profiler::start('self::app::init');
             self::$_app->init($code, $type, $options);
             Magento_Profiler::stop('self::app::init');
-            self::$_app->loadAreaPart(Mage_Core_Model_App_Area::AREA_GLOBAL, Mage_Core_Model_App_Area::PART_EVENTS);
         }
         return self::$_app;
     }
@@ -785,7 +784,7 @@ protected static function _setIsInstalled($options = array())
      */
     protected static function _setConfigModel($options = array())
     {
-        if (isset($options['config_model']) && Magento_Autoload::getInstance()->classExists($options['config_model'])) {
+        if (isset($options['config_model']) && class_exists($options['config_model'])) {
             $alternativeConfigModelName = $options['config_model'];
             unset($options['config_model']);
             $alternativeConfigModel = new $alternativeConfigModelName($options);
@@ -834,103 +833,41 @@ public static function isInstalled($options = array())
     }
 
     /**
-     * log facility (??)
+     * log a message to system log or arbitrary file
      *
      * @param string $message
      * @param integer $level
      * @param string $file
      * @param bool $forceLog
      */
-    public static function log($message, $level = null, $file = '', $forceLog = false)
+    public static function log($message, $level = null, $file = 'system.log', $forceLog = false)
     {
-        if (!self::getConfig()) {
-            return;
-        }
-
-        try {
-            $logActive = self::getStoreConfig('dev/log/active');
-            if (empty($file)) {
-                $file = self::getStoreConfig('dev/log/file');
-            }
-        }
-        catch (Exception $e) {
-            $logActive = true;
-        }
-
-        if (!self::$_isDeveloperMode && !$logActive && !$forceLog) {
-            return;
-        }
-
-        $level  = is_null($level) ? Zend_Log::DEBUG : $level;
-        $file = empty($file) ? 'system.log' : $file;
-
-        try {
-            if (!isset(self::$_loggers[$file])) {
-                $logFile = self::_expandLogFileName($file);
-
-                $format = '%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL;
-                $formatter = new Zend_Log_Formatter_Simple($format);
-                $writerModel = (string)self::getConfig()->getNode('global/log/core/writer_model');
-                if (!self::$_app || !$writerModel || !is_subclass_of($writerModel, 'Zend_Log_Writer_Stream')) {
-                    $writerModel = 'Zend_Log_Writer_Stream';
-                }
-                /** @var $writer Zend_Log_Writer_Stream */
-                $writer = new $writerModel($logFile);
-                $writer->setFormatter($formatter);
-                self::$_loggers[$file] = new Zend_Log($writer);
-            }
-
-            if (is_array($message) || is_object($message)) {
-                $message = print_r($message, true);
-            }
-
-            self::$_loggers[$file]->log($message, $level);
-        }
-        catch (Exception $e) {
-        }
-    }
-
-    /**
-     * Expand log file name to absolute path, if necessary
-     *
-     * @param string $file
-     * @return string
-     */
-    protected static function _expandLogFileName($file)
-    {
-        /*
-         * Check whether a file is a wrapper
-         * @link http://www.php.net/manual/en/wrappers.php
-         */
-        if (preg_match('#^[a-z][a-z0-9+.-]*\://#i', $file)) {
-            return $file;
-        }
-        $dir  = self::getBaseDir('var') . DIRECTORY_SEPARATOR . 'log';
-        $file = $dir . DIRECTORY_SEPARATOR . $file;
-        if (!is_dir($dir)) {
-            mkdir($dir);
-            chmod($dir, 0777);
+        $level = is_null($level) ? Zend_Log::DEBUG : $level;
+        if (empty($file) || $file == 'system.log') {
+            $file = 'system.log';
+            $key = Mage_Core_Model_Logger::LOGGER_SYSTEM;
+        } elseif ($file == 'exception.log') {
+            $key = Mage_Core_Model_Logger::LOGGER_EXCEPTION;
+        } else {
+            $forceLog = true;
+            $key = $file;
         }
-        if (!file_exists($file)) {
-            file_put_contents($file, '');
-            chmod($file, 0777);
+        /** @var $logger Mage_Core_Model_Logger */
+        $logger = self::$_objectManager->get('Mage_Core_Model_Logger');
+        if ($forceLog && !$logger->hasLog($key)) {
+            $logger->addStreamLog($key, $file);
         }
-        return $file;
+        $logger->log($message, $level, $key);
     }
 
-
     /**
      * Write exception to log
      *
      * @param Exception $e
      */
     public static function logException(Exception $e)
     {
-        if (!self::getConfig()) {
-            return;
-        }
-        $file = self::getStoreConfig('dev/log/exception_file');
-        self::log("\n" . $e->__toString(), Zend_Log::ERR, $file);
+        self::$_objectManager->get('Mage_Core_Model_Logger')->logException($e);
     }
 
     /**

app/code/core/Mage/Dataflow/Helper/Data.php renamed to app/autoload.php

@@ -1,5 +1,7 @@
 <?php
 /**
+ * Register basic autoloader that uses include path
+ *
  * Magento
  *
  * NOTICE OF LICENSE
@@ -18,16 +20,8 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    Mage
- * @package     Mage_Dataflow
- * @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)
- */
-
-/**
- * Dataflow data helper
- *
+ * @copyright  Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class Mage_Dataflow_Helper_Data extends Mage_Core_Helper_Abstract
-{
-}
+require_once __DIR__ . '/../lib/Magento/Autoload/IncludePath.php';
+spl_autoload_register('Magento_Autoload_IncludePath::load');

app/bootstrap.php

@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category   Magento
- * @copyright  Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright  Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -69,24 +69,26 @@
 /**
  * Require necessary files
  */
-require_once BP . '/lib/Magento/Autoload.php';
 require_once BP . '/app/code/core/Mage/Core/functions.php';
 require_once BP . '/app/Mage.php';
 
 if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
     Mage::setIsDeveloperMode(true);
 }
-Mage::register('original_include_path', get_include_path());
-
-$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'local';
-$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'community';
-$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'core';
-$paths[] = BP . DS . 'lib';
-Magento_Autoload::getInstance()->addIncludePath($paths);
 
+require_once __DIR__ . '/autoload.php';
+Magento_Autoload_IncludePath::addIncludePath(array(
+    BP . DS . 'app' . DS . 'code' . DS . 'local',
+    BP . DS . 'app' . DS . 'code' . DS . 'community',
+    BP . DS . 'app' . DS . 'code' . DS . 'core',
+    BP . DS . 'lib',
+));
 $classMapPath = BP . DS . 'var/classmap.ser';
 if (file_exists($classMapPath)) {
-    Magento_Autoload::getInstance()->addFilesMap($classMapPath);
+    require_once BP . '/lib/Magento/Autoload/ClassMap.php';
+    $classMap = new Magento_Autoload_ClassMap(BP);
+    $classMap->addMap(unserialize(file_get_contents($classMapPath)));
+    spl_autoload_register(array($classMap, 'load'));
 }
 
 $definitionsFile = BP . DS . 'var/di/definitions.php';

app/code/core/Mage/AdminNotification/Helper/Data.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Config/Source/Frequency.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Feed.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Inbox.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Observer.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/Model/Survey.php

@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml

@@ -21,7 +21,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->

app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml

@@ -21,7 +21,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->

app/code/core/Mage/AdminNotification/etc/adminhtml/system.xml

@@ -21,7 +21,7 @@
  *
  * @category    Mage
  * @package     Mage_AdminNotification
- * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->