Skip to content

Commit 68bdc66

Browse files
committed
Published additional tests and fixes
- Various code integrity fixes in different places: -- Fixed obsolete references to classes -- Fixed broken references to template and static view files -- Fixed some minor occurrences of deprecated code -- Code style minor fixes - Various minor bugfixes - Implemented "developer mode" in integration tests - Added "rollback" scripts capability for data fixtures - Removed deprecated methods and attributes from product type class - Restructured code integrity tests: -- Moved out part of the tests from integration into static tests -- Introduced "Legacy" test suite in static tests. This test suite is not executed by default when running either phpunit directly or using the "batch tool" -- Simplified and reorganized the "Exemplar" and self-assessment tests for static code analysis - Covered previously made backwards-incompatible changes with legacy tests - Changed storage of class map from a PHP-file with array into a better-performing text file with serialized array. - Published dev/tests/static and dev/tests/unit
1 parent 9b9ce2c commit 68bdc66

File tree

302 files changed

+10088
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

302 files changed

+10088
-377
lines changed

app/bootstrap.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,12 @@
8282
$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'community';
8383
$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'core';
8484
$paths[] = BP . DS . 'lib';
85+
Magento_Autoload::getInstance()->addIncludePath($paths);
8586

86-
Magento_Autoload::getInstance()->addIncludePath($paths)
87-
->addFilesMap(BP . '/_classmap.php');
87+
$classMapPath = BP . DS . 'var/classmap.ser';
88+
if (file_exists($classMapPath)) {
89+
Magento_Autoload::getInstance()->addFilesMap($classMapPath);
90+
}
8891

8992
#Magento_Profiler::enable();
9093
#Magento_Profiler::registerOutput(new Magento_Profiler_Output_Html());

app/code/community/Phoenix/Moneybookers/etc/adminhtml.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@
1313
* obtain it through the world-wide-web, please send an email
1414
* to [email protected] so we can send you a copy immediately.
1515
*
16+
* DISCLAIMER
17+
*
18+
* Do not edit or add to this file if you wish to upgrade Magento to newer
19+
* versions in the future. If you wish to customize Magento for your
20+
* needs please refer to http://www.magentocommerce.com for more information.
21+
*
1622
* @category Phoenix
1723
* @package Phoenix_Moneybookers
18-
* @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
24+
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1925
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2026
*/
2127
-->

app/code/core/Mage/Catalog/Model/Resource/Abstract.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,20 @@ protected function _insertAttribute($object, $attribute, $value)
311311
return $this->_saveAttributeValue($object, $attribute, $value);
312312
}
313313

314+
/**
315+
* Update entity attribute value
316+
*
317+
* @param Varien_Object $object
318+
* @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
319+
* @param mixed $valueId
320+
* @param mixed $value
321+
* @return Mage_Catalog_Model_Resource_Abstract
322+
*/
323+
protected function _updateAttribute($object, $attribute, $valueId, $value)
324+
{
325+
return $this->_saveAttributeValue($object, $attribute, $value);
326+
}
327+
314328
/**
315329
* Update attribute value for specific store
316330
*

app/code/core/Mage/Core/Model/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ public function getHelperClassName($helperClass)
12411241
* Retrieve resource helper instance
12421242
*
12431243
* Example:
1244-
* $config->getResourceHelper('Mage_Cms')
1244+
* $config->getResourceHelper('Mage_Core')
12451245
* will instantiate Mage_Cms_Model_Resource_Helper_<db_adapter_name>
12461246
*
12471247
* @param string $moduleName

app/code/core/Mage/Core/Model/Convert.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
* @package Mage_Core
3232
* @author Magento Core Team <[email protected]>
3333
*/
34-
//class Mage_Core_Model_Convert extends Varien_Convert_Profile_Collection
3534
class Mage_Core_Model_Convert extends Mage_Dataflow_Model_Convert_Profile_Collection
3635
{
3736
public function __construct()

app/code/core/Mage/Core/Model/Shell/Abstract.php renamed to app/code/core/Mage/Core/Model/ShellAbstract.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @package Mage_Shell
3232
* @author Magento Core Team <[email protected]>
3333
*/
34-
abstract class Mage_Core_Model_Shell_Abstract
34+
abstract class Mage_Core_Model_ShellAbstract
3535
{
3636
/**
3737
* Raw arguments, that should be parsed
@@ -75,7 +75,7 @@ public function __construct($entryPoint)
7575
* Sets raw arguments to be parsed
7676
*
7777
* @param array $args
78-
* @return Mage_Core_Model_Shell_Abstract
78+
* @return Mage_Core_Model_ShellAbstract
7979
*/
8080
public function setRawArgs($args)
8181
{
@@ -98,7 +98,7 @@ protected function _getRootPath()
9898
/**
9999
* Parses .htaccess file and apply php settings to shell script
100100
*
101-
* @return Mage_Core_Model_Shell_Abstract
101+
* @return Mage_Core_Model_ShellAbstract
102102
*/
103103
protected function _applyPhpVariables()
104104
{
@@ -126,7 +126,7 @@ protected function _applyPhpVariables()
126126
/**
127127
* Parses input arguments
128128
*
129-
* @return Mage_Core_Model_Shell_Abstract
129+
* @return Mage_Core_Model_ShellAbstract
130130
*/
131131
protected function _parseArgs()
132132
{
@@ -150,7 +150,7 @@ protected function _parseArgs()
150150
/**
151151
* Runs script
152152
*
153-
* @return Mage_Core_Model_Shell_Abstract
153+
* @return Mage_Core_Model_ShellAbstract
154154
*/
155155
abstract public function run();
156156

app/code/core/Mage/Directory/Model/Resource/Currency.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Mage_Directory_Model_Resource_Currency extends Mage_Core_Model_Resource_Db
5454
*/
5555
protected function _construct()
5656
{
57-
$this->_init('Mage_Directory_Model_Currency', 'currency_code');
57+
$this->_init('directory_currency', 'currency_code');
5858
$this->_currencyRateTable = $this->getTable('directory_currency_rate');
5959
}
6060

app/code/core/Mage/ImportExport/Model/Import.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ public function expandSource()
374374
$count = self::MAX_IMPORT_CHUNKS;
375375
for ($i = 1; $i < $count; $i++) {
376376
$writer = Mage::getModel(
377-
'importexport/export_adapter_csv',
377+
'Mage_ImportExport_Model_Export_Adapter_Csv',
378378
self::getWorkingDir() . sprintf($filenameFormat, $i)
379379
);
380380

app/code/core/Mage/ImportExport/view/adminhtml/layout.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Magento
5+
*
6+
* NOTICE OF LICENSE
7+
*
8+
* This source file is subject to the Academic Free License (AFL 3.0)
9+
* that is bundled with this package in the file LICENSE_AFL.txt.
10+
* It is also available through the world-wide-web at this URL:
11+
* http://opensource.org/licenses/afl-3.0.php
12+
* If you did not receive a copy of the license and are unable to
13+
* obtain it through the world-wide-web, please send an email
14+
* to [email protected] so we can send you a copy immediately.
15+
*
16+
* DISCLAIMER
17+
*
18+
* Do not edit or add to this file if you wish to upgrade Magento to newer
19+
* versions in the future. If you wish to customize Magento for your
20+
* needs please refer to http://www.magentocommerce.com for more information.
21+
*
22+
* @category Mage
23+
* @package Mage_ImportExport
24+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26+
*/
27+
-->
228
<layout>
329
<adminhtml_import_index>
430
<reference name="content">

app/code/core/Mage/Index/Model/Shell.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @package Mage_Shell
3232
* @author Magento Core Team <[email protected]>
3333
*/
34-
class Mage_Index_Model_Shell extends Mage_Core_Model_Shell_Abstract
34+
class Mage_Index_Model_Shell extends Mage_Core_Model_ShellAbstract
3535
{
3636
/**
3737
* Gets indexer instance

0 commit comments

Comments
 (0)