Skip to content

Draft: Shorter copyright header #4624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
18063d2
shorter copyright
sreichel Jan 9, 2025
1a36618
updated dates
sreichel Jan 9, 2025
52273e7
Merge branch 'main' into cr
sreichel Jan 11, 2025
f7b9716
Merge branch 'main' into cr
sreichel Jan 14, 2025
8460940
Merge branch 'main' into cr
sreichel Jan 14, 2025
086abc2
removed dates
sreichel Jan 30, 2025
bcaa045
removed double space
sreichel Jan 30, 2025
de0baa6
removed workflow
sreichel Jan 30, 2025
4ad03f0
Merge branch 'main' into cr
sreichel Jan 30, 2025
e29a116
added COPYING.txt
sreichel Feb 6, 2025
4a9aa48
updated php-files
sreichel Feb 6, 2025
ba42ab4
updated xml-files
sreichel Feb 6, 2025
9f6749b
updated phtml-files
sreichel Feb 6, 2025
e190c0a
updated other
sreichel Feb 6, 2025
32602b4
Merge branch 'main' into cr
sreichel Feb 6, 2025
1094d63
Merge branch 'main' into cr
sreichel Feb 6, 2025
3997411
Merge branch 'main' into cr
sreichel Feb 6, 2025
21a427d
Merge branch 'main' into cr
sreichel Feb 6, 2025
a4742a5
updated test-files
sreichel Feb 6, 2025
91dad72
added phpdocumentor
sreichel Feb 8, 2025
23653ec
added phpdocumentor config
sreichel Feb 8, 2025
baa4821
gitignore
sreichel Feb 8, 2025
c4d01ac
Merge branch 'main' into cr
sreichel Feb 10, 2025
3936b85
Use AI generated script to apply docblock changes
colinmollenhour Feb 10, 2025
7ca8b00
Add back @license line
colinmollenhour Feb 10, 2025
f8b8212
Fix spacing
colinmollenhour Feb 10, 2025
d7eacc7
Merge branch 'main' into shorter-copyright-header
sreichel Feb 10, 2025
8aafe91
Manual cleanup of xml and other files
colinmollenhour Feb 10, 2025
e062b46
Merge branch 'main' into shorter-copyright-header
sreichel Mar 15, 2025
8118ef9
php-cs-fixer
sreichel Mar 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
58 changes: 0 additions & 58 deletions .github/workflows/update-copyright.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -88,6 +88,9 @@ tests/logging
phpunit.xml
!.phpunit.dist.xml

# phpdocumentor
phpdoc.xml

# build
/build

37 changes: 37 additions & 0 deletions .phpdoc.dist.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdocumentor
configVersion="3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://www.phpdoc.org"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/phpDocumentor/phpDocumentor/master/data/xsd/phpdoc.xsd"
>
<setting name="template.color" value="blue"/>

<paths>
<output>build/phpdoc/api</output>
<cache>build/phpdoc/cache</cache>
</paths>

<version number="3.0.0">
<api>
<source dsn=".">
<path>app</path>
<path>lib</path>
<path>design</path>
<path>COPYING.txt</path>
</source>
<ignore>
<path>app/code/core/Mage/*/sql/**/*</path>
<path>app/code/core/Mage/*/data/**/*</path>
</ignore>
<extensions>
<extension>php</extension>
<extension>phtml</extension>
<extension>txt</extension>
</extensions>
<visibility>public</visibility>
<visibility>protected</visibility>
<visibility>private</visibility>
</api>
</version>
</phpdocumentor>
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_blocks.meta.php
Original file line number Diff line number Diff line change
@@ -1311,4 +1311,4 @@
'wishlist/share_wishlist' => \Mage_Wishlist_Block_Share_Wishlist::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_blocks_methods.meta.php
Original file line number Diff line number Diff line change
@@ -1311,4 +1311,4 @@
'wishlist/share_wishlist' => \Mage_Wishlist_Block_Share_Wishlist::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_helpers.meta.php
Original file line number Diff line number Diff line change
@@ -190,4 +190,4 @@
'wishlist/data' => \Mage_Wishlist_Helper_Data::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_helpers_methods.meta.php
Original file line number Diff line number Diff line change
@@ -3040,4 +3040,4 @@
'wishlist/data' => \Mage_Wishlist_Helper_Data::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_models.meta.php
Original file line number Diff line number Diff line change
@@ -6312,4 +6312,4 @@
'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_models_methods.meta.php
Original file line number Diff line number Diff line change
@@ -28404,4 +28404,4 @@
'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_resource_helpers.meta.php
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@
'sales' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
])
);
}
}
2 changes: 1 addition & 1 deletion .phpstorm.meta.php/magento_resource_models.meta.php
Original file line number Diff line number Diff line change
@@ -1266,4 +1266,4 @@
'wishlist/wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
])
);
}
}
Original file line number Diff line number Diff line change
@@ -633,4 +633,4 @@
'wishlist/wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
])
);
}
}
20 changes: 20 additions & 0 deletions COPYING.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
COPYRIGHT

OpenMage - an eCommerce platform

Copyright © 2006-2020 Magento, Inc. (https://magento.com)
Copyright © 2016-2025 The OpenMage Contributors (https://openmage.org)

SOFTWARE LICENSE

The free software license of OpenMage themes (located in app/design/) and skins (located in skin/) is the
Academic Free License (AFL 3.0) that is bundled with this package in the file LICENSE_AFL.txt.
It is also available at https://opensource.org/license/afl-3-0-php

The free software license of TinyMCE that may be bundled and used exclusively with this project is a proprietary license
that is bundled with this package in the file LICENSE_TINYMCE.txt.
It is also available at https://github.com/OpenMage/magento-lts/blob/main/LICENSE_TINYMCE.txt

The free software license of all other OpenMage code included with this package unless otherwise noted in the source file
or source file directory is The Open Software License 3.0 (OSL 3.0) that is bundled with this package in the file LICENSE.txt.
It is also available at https://opensource.org/license/osl-3.0.php
10 changes: 2 additions & 8 deletions api.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
* This file is part of OpenMage.
* For copyright and license information, please view the COPYING.txt file that was distributed with this source code.
*
* @category Mage
* @package Mage
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

$magentoRootDir = getcwd();
13 changes: 3 additions & 10 deletions app/Mage.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2017-2025 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

defined('DS') || define('DS', DIRECTORY_SEPARATOR);
22 changes: 6 additions & 16 deletions app/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @package Mage
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* Apply workaround for the libxml PHP bugs:
* @link https://bugs.php.net/bug.php?id=62577
* @link https://bugs.php.net/bug.php?id=64938
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage_
* @link https://bugs.php.net/bug.php?id=62577
* @link https://bugs.php.net/bug.php?id=64938
*/
if ((LIBXML_VERSION < 20900) && function_exists('libxml_disable_entity_loader')) {
libxml_disable_entity_loader(false);
18 changes: 3 additions & 15 deletions app/code/core/Mage/Admin/Helper/Block.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* Admin Block Helper
*
* @category Mage
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage_Admin
*/
class Mage_Admin_Helper_Block
18 changes: 3 additions & 15 deletions app/code/core/Mage/Admin/Helper/Data.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* Admin Data Helper
*
* @category Mage
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage_Admin
*/
class Mage_Admin_Helper_Data extends Mage_Core_Helper_Abstract
18 changes: 3 additions & 15 deletions app/code/core/Mage/Admin/Helper/Rules/Fallback.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* Admin Data Helper
*
* @category Mage
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage_Admin
*/
class Mage_Admin_Helper_Rules_Fallback extends Mage_Core_Helper_Abstract
18 changes: 3 additions & 15 deletions app/code/core/Mage/Admin/Helper/Variable.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?php

/**
* OpenMage
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available at https://opensource.org/license/osl-3-0-php
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* Admin Variable Helper
*
* @category Mage
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Open Software License (OSL 3.0)
* @package Mage_Admin
*/
class Mage_Admin_Helper_Variable
Loading
Loading