-
-
Notifications
You must be signed in to change notification settings - Fork 436
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.9.4.x' into phpstan/mage-backup
# Conflicts: # .gitignore # app/code/core/Mage/Backup/Helper/Data.php # app/code/core/Mage/Backup/Model/Backup.php # app/code/core/Mage/Backup/etc/adminhtml.xml # app/code/core/Mage/Backup/etc/config.xml # lib/Mage/Backup.php # lib/Mage/Backup/Archive/Tar.php # lib/Mage/Backup/Db.php # lib/Mage/Backup/Exception.php # lib/Mage/Backup/Exception/CantLoadSnapshot.php # lib/Mage/Backup/Exception/FtpConnectionFailed.php # lib/Mage/Backup/Exception/FtpValidationFailed.php # lib/Mage/Backup/Exception/NotEnoughFreeSpace.php # lib/Mage/Backup/Exception/NotEnoughPermissions.php # lib/Mage/Backup/Filesystem.php # lib/Mage/Backup/Filesystem/Helper.php # lib/Mage/Backup/Filesystem/Rollback/Abstract.php # lib/Mage/Backup/Filesystem/Rollback/Fs.php # lib/Mage/Backup/Filesystem/Rollback/Ftp.php # lib/Mage/Backup/Interface.php # lib/Mage/Backup/Media.php # lib/Mage/Backup/Nomedia.php # lib/Mage/Backup/Snapshot.php
- Loading branch information
Showing
501 changed files
with
1,011 additions
and
1,463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
<?xml version="1.0"?> | ||
<ruleset name="Custom ruleset" | ||
xmlns="http://pmd.sf.net/ruleset/1.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" | ||
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"> | ||
<description> | ||
OpenMage ruleset | ||
</description> | ||
|
||
<!-- UNUSEDCODE | ||
UnusedFormalParameter [fixed] | ||
UnusedLocalVariable | ||
UnusedPrivateField | ||
UnusedPrivateMethod | ||
--> | ||
<rule ref="rulesets/unusedcode.xml" /> | ||
|
||
<!-- CLEANCODE | ||
BooleanArgumentFlag | ||
ElseExpression | ||
ErrorControlOperator | ||
DuplicatedArrayKey | ||
IfStatementAssignment | ||
MissingImport | ||
StaticAccess | ||
UndefinedVariable | ||
--> | ||
<rule ref="rulesets/cleancode.xml"> | ||
<exclude name="BooleanArgumentFlag" /> | ||
<exclude name="ElseExpression" /> <!-- can be fixed in some cases --> | ||
<exclude name="IfStatementAssignment" /> <!-- can be fixed --> | ||
<exclude name="MissingImport" /> <!-- can be fixed --> | ||
<exclude name="StaticAccess" /> | ||
<exclude name="UndefinedVariable" /> <!-- can be fixed --> | ||
</rule> | ||
<rule ref="rulesets/cleancode.xml/MissingImport"> | ||
<properties> | ||
<property name="ignore-global" value="true" /> | ||
</properties> | ||
</rule> | ||
|
||
<!-- CONTROVERSIAL | ||
CamelCaseClassName | ||
CamelCaseMethodName | ||
CamelCaseParameterName | ||
CamelCasePropertyName | ||
CamelCaseVariableName | ||
Superglobals | ||
--> | ||
<rule ref="rulesets/controversial.xml/CamelCaseMethodName"> | ||
<properties> | ||
<property name="allow-underscore" value="true" /> | ||
</properties> | ||
</rule> | ||
<rule ref="rulesets/controversial.xml/CamelCaseParameterName" /> | ||
<rule ref="rulesets/controversial.xml/CamelCasePropertyName"> | ||
<properties> | ||
<property name="allow-underscore" value="true" /> | ||
</properties> | ||
</rule> | ||
<rule ref="rulesets/controversial.xml/CamelCaseVariableName"> | ||
<properties> | ||
<property name="allow-underscore" value="true" /> | ||
</properties> | ||
</rule> | ||
<rule ref="rulesets/controversial.xml/Superglobals" /> | ||
|
||
<!-- NAMEING | ||
BooleanGetMethodName | ||
ConstantNamingConventions | ||
ConstructorWithNameAsEnclosingClass | ||
LongClassName | ||
ShortClassName | ||
LongVariable | ||
ShortVariable | ||
ShortMethodName | ||
--> | ||
<rule ref="rulesets/naming.xml/ShortVariable"> | ||
<properties> | ||
<property name="exceptions" value="a,b,e,id,idx,io,ip,to,x,y,x1,x2,y1,y2" /> | ||
</properties> | ||
</rule> | ||
|
||
<!-- DESIGN | ||
CountInLoopExpression | ||
CouplingBetweenObjects | ||
DepthOfInheritance | ||
DevelopmentCodeFragment | ||
EmptyCatchBlock | ||
EvalExpression | ||
ExitExpression | ||
GotoStatement | ||
NumberOfChildren | ||
--> | ||
<rule ref="rulesets/design.xml"> | ||
<exclude name="CouplingBetweenObjects" /> | ||
<exclude name="DepthOfInheritance" /> | ||
<exclude name="NumberOfChildren" /> | ||
</rule> | ||
|
||
<!-- CODESIZE | ||
ExcessiveClassComplexity | ||
ExcessiveClassLength | ||
ExcessiveMethodLength | ||
ExcessiveParameterList | ||
ExcessivePublicCount | ||
CyclomaticComplexity | ||
NPathComplexity | ||
TooManyFields | ||
TooManyMethods | ||
TooManyPublicMethods | ||
--> | ||
<rule ref="rulesets/codesize.xml"> | ||
<exclude name="CyclomaticComplexity" /> | ||
<exclude name="ExcessiveClassComplexity" /> | ||
<exclude name="ExcessiveClassLength" /> | ||
<exclude name="ExcessiveMethodLength" /> | ||
<exclude name="ExcessivePublicCount" /> | ||
<exclude name="NPathComplexity" /> | ||
<exclude name="TooManyFields" /> | ||
<exclude name="TooManyMethods" /> | ||
<exclude name="TooManyPublicMethods" /> | ||
</rule> | ||
</ruleset> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.