Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
9549482
DDEV: added cronjob
sreichel Feb 3, 2024
9e5c7d8
Merge branch 'main' into ddev-cron
sreichel Feb 3, 2024
8330bce
Fix install with dev-mode ON
sreichel Feb 11, 2024
f752180
Update FUNDING.yml
sreichel Feb 12, 2024
21a9787
Merge pull request #1 from sreichel/fix-install-devmode-on
sreichel Feb 12, 2024
cdae0cb
Removed files added by `ddev get ddev/ddev-cron`
sreichel Feb 12, 2024
9e74f9a
Merge pull request #2 from sreichel/ddev-cron
sreichel Feb 12, 2024
ccd40a5
PHP8: fixes passing null in Mage_Adminhtml_Block_Customer_Edit_Tab_Wi…
sreichel Feb 12, 2024
a6d5d9e
Merge pull request #3 from sreichel/sreichel-funding
sreichel Feb 12, 2024
d59529b
Merge pull request #5 from sreichel/om-fix-3828
sreichel Feb 12, 2024
c562b79
PHP8: fixes passing null in `Mage_Adminhtml_Block_System_Convert_Gui_…
sreichel Feb 13, 2024
8839d3f
Fixes #3716 (#7)
sreichel Feb 13, 2024
16167e3
Updated PhpUnit test (#10)
sreichel Feb 14, 2024
38e3480
PHP8: fixes passing null to `Mage_Downloadable_Helper_File::getFilePa…
sreichel Feb 14, 2024
923148f
Revert: move tests back to dev directory (#11)
sreichel Feb 16, 2024
d6d0d8d
Sync OpenMage (#12)
sreichel Feb 16, 2024
5d1366a
Merge branch 'main' into main
sreichel Feb 16, 2024
6647256
Sync OpneMage (#13)
sreichel Feb 16, 2024
6df1405
Fix;: return correct php.ini value w/o unit set (#16)
sreichel Feb 16, 2024
ab6cf6f
Merge branch 'OpenMage:main' into main
sreichel Feb 16, 2024
1f8730f
Merge branch 'openmage-strict:main' into main
sreichel Feb 16, 2024
63b5a7b
Merge branch 'OpenMage:main' into main
sreichel Feb 16, 2024
267d83a
Merge branch 'openmage-strict:main' into main
sreichel Feb 16, 2024
370d981
Sort order grid columns (#17)
sreichel Feb 17, 2024
633b9eb
Merge branch 'OpenMage:main' into main
sreichel Feb 18, 2024
0fe2d71
Merge branch 'openmage-strict:main' into main
sreichel Feb 18, 2024
15eb83f
Updated `Varien_Object::getData()` and added `getDataByKey()` & `getD…
sreichel Feb 19, 2024
f944168
Bump squizlabs/php_codesniffer from 3.8.1 to 3.9.0 (#19)
dependabot[bot] Feb 19, 2024
e0216d9
Bump phpstan/phpstan from 1.10.57 to 1.10.58 (#20)
dependabot[bot] Feb 19, 2024
369eca1
PHP8: fixes deprecated passing null in `Varien_Object::toString()` (#21)
sreichel Feb 19, 2024
533b240
Merge branch 'OpenMage:main' into main
sreichel Feb 19, 2024
1185878
Merge branch 'openmage-strict:main' into main
sreichel Feb 19, 2024
6615cd7
Merge branch 'OpenMage:main' into main
sreichel Feb 20, 2024
f8c01b5
Merge branch 'openmage-strict:main' into main
sreichel Feb 20, 2024
7798293
Added defaults for CCsave payment (#23)
sreichel Feb 20, 2024
7ab2608
Some typo fixes (#24)
sreichel Feb 20, 2024
17c182e
Some phpstan fixes in Mage_Adminhtml (#25)
sreichel Feb 20, 2024
adabe99
Merge pull request #3 from sreichel/main
sreichel Feb 20, 2024
f17443e
Merge remote-tracking branch 'upstream/main'
sreichel Apr 9, 2024
244f7f1
Merge branch 'OpenMage:main' into main
sreichel Apr 18, 2024
d605609
Merge remote-tracking branch 'lts/main'
sreichel May 15, 2024
10a44ec
Merge branch 'OpenMage:main' into main
sreichel May 28, 2024
28bbb75
Merge branch 'OpenMage:main' into main
sreichel May 28, 2024
8198718
Added unit tests to checks (#8)
sreichel May 28, 2024
0f22e40
Bump friendsofphp/php-cs-fixer from 3.57.2 to 3.58.0 (#10)
dependabot[bot] May 29, 2024
cea740b
Bump phpstan/phpstan from 1.10.67 to 1.11.2 (#9)
dependabot[bot] May 29, 2024
89a281f
Update phpstorm meta-files (#11)
sreichel May 29, 2024
5cacf5d
Bump friendsofphp/php-cs-fixer from 3.58.0 to 3.58.1 (#14)
dependabot[bot] Jun 8, 2024
646051a
Bump phpstan/phpstan from 1.11.2 to 1.11.4 (#15)
dependabot[bot] Jun 8, 2024
4055bf0
Merge remote-tracking branch 'lts/main'
sreichel Jul 14, 2024
97e04c8
Require php8.1 at least
sreichel Jul 14, 2024
ec483e2
Merge branch 'OpenMage:main' into main
sreichel Jul 17, 2024
1d1ffc8
Merge branch 'OpenMage:main' into main
sreichel Jul 25, 2024
1f3d8b9
Update composer
sreichel Aug 5, 2024
975f558
Update workflows to run on php 8.1
sreichel Aug 5, 2024
b366959
Updated unit tests
sreichel Aug 5, 2024
80543c4
Merged sonar + phpunit workflow
sreichel Aug 5, 2024
61f86f3
OM-4122
sreichel Aug 5, 2024
685ea3e
Updated composer
sreichel Aug 5, 2024
4ae940a
Updated Docblock
sreichel Aug 5, 2024
86e31ba
PhpStan update
sreichel Aug 6, 2024
0a27139
Merge remote-tracking branch 'lts/main'
sreichel Aug 6, 2024
e50d57e
phpstan - phpcs fix
sreichel Aug 6, 2024
bbf0d26
Bump phpstan/phpstan from 1.11.7 to 1.11.9 (#27)
dependabot[bot] Aug 6, 2024
b77bb58
Bump friendsofphp/php-cs-fixer from 3.59.3 to 3.61.1 (#28)
dependabot[bot] Aug 6, 2024
d2c8ca4
Merge branch 'OpenMage:main' into main
sreichel Aug 7, 2024
a95b299
Bump phpseclib/phpseclib from 3.0.39 to 3.0.41 (#30)
dependabot[bot] Aug 21, 2024
052c2e3
Bump friendsofphp/php-cs-fixer from 3.61.1 to 3.62.0 (#31)
dependabot[bot] Aug 21, 2024
4183d5d
Bump phpstan/phpstan from 1.11.9 to 1.11.10 (#32)
dependabot[bot] Aug 21, 2024
3003edc
Added rector as dependency (#33)
sreichel Aug 21, 2024
48ce472
Merge branch 'OpenMage:main' into main
sreichel Aug 24, 2024
56a3777
Merge branch 'OpenMage:main' into main
sreichel Aug 26, 2024
97cd4c7
Bump tj-actions/changed-files from 44 to 45 (#37)
dependabot[bot] Aug 28, 2024
1ef510d
Bump phpstan/phpstan from 1.11.10 to 1.11.11 (#36)
dependabot[bot] Aug 28, 2024
5a68525
Bump rector/rector from 1.2.3 to 1.2.4 (#35)
dependabot[bot] Aug 28, 2024
b9a2229
Update .gitpod.yml
sreichel Aug 30, 2024
83209a0
Merge branch 'OpenMage:main' into main
sreichel Aug 30, 2024
18b7a72
Added copyright workflow (#38)
sreichel Sep 1, 2024
2ce0276
Test
sreichel Sep 1, 2024
531b223
Test
sreichel Sep 1, 2024
ae66441
Final test
sreichel Sep 1, 2024
e6f07c9
update copyright (#41)
github-actions[bot] Sep 1, 2024
2c3f0c9
Gitpod action (#50)
sreichel Sep 21, 2024
39cd9e5
Update gitpod-comment.yml
sreichel Sep 21, 2024
a20a89f
Update gitpod-comment.yml (#53)
sreichel Sep 21, 2024
f4d160c
Gitpod action
sreichel Sep 21, 2024
68a5b92
Gitpod action
sreichel Sep 28, 2024
0b1670c
Merge remote-tracking branch 'lts/main'
sreichel Oct 27, 2024
1789df1
Merge remote-tracking branch 'lts/main'
sreichel Oct 27, 2024
7e56a0b
Merge remote-tracking branch 'origin/main'
sreichel Oct 27, 2024
85a1a65
Merge remote-tracking branch 'lts/main'
sreichel Mar 30, 2025
678eed2
Merge branch 'OpenMage:main' into main
sreichel Apr 7, 2025
9acae01
Updated phpunit workflow
sreichel Apr 7, 2025
7004b42
Updated phpunit workflow
sreichel Apr 7, 2025
8083c69
Updated sonar-project.properties
sreichel Apr 7, 2025
37b0076
Updated sonar-project.properties
sreichel Apr 7, 2025
dd926a2
Updated composer.lock
sreichel Apr 7, 2025
080d382
cs
sreichel Apr 7, 2025
ce50c00
Updated sonar-project.properties
sreichel Apr 7, 2025
4f54cfc
Merge remote-tracking branch 'origin/main'
sreichel Apr 7, 2025
b125721
Merge branch 'OpenMage:main' into main
sreichel Apr 10, 2025
a2bec97
Merge branch 'main' into main
sreichel Apr 28, 2025
f48da5c
Merge branch 'OpenMage:main' into main
sreichel May 5, 2025
5f1d73d
Merge branch 'OpenMage:main' into main
sreichel May 5, 2025
ba1964e
Merge remote-tracking branch 'origin/main'
sreichel May 5, 2025
c492dce
Added `empiricompany/openmage_ignition`
sreichel May 5, 2025
b257968
Merge branch 'main' into ignition
sreichel May 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

open_collective: openmage
github: sreichel
28 changes: 28 additions & 0 deletions .github/workflows/gitpod-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Add Gitpod link

on:
pull_request_target:
types: [opened]

jobs:
comment-in-pr:

runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
repository-projects: write
id-token: write

steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/github-script@v7
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/${{github.repository}}/pull/${{github.event.number}})'
})
1 change: 1 addition & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
name: Labeler
on:
pull_request_target:
workflow_call:
# Allow manually triggering the workflow.
workflow_dispatch:

Expand Down
Empty file added .github/workflows/sonar.yml
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public function render(Varien_Object $row)
$class = 'minor';
$value = $notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_MINOR);
break;
default:
case Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE:
default:
$class = 'notice';
$value = $notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function _prepareColumns()
*
* @param Mage_SalesRule_Model_Resource_Report_Collection $collection
* @param Varien_Object $filterData
* @return Mage_Adminhtml_Block_Report_Grid_Abstract
* @return $this
*/
protected function _addCustomFilter($collection, $filterData)
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

/**
Expand Down Expand Up @@ -161,7 +161,7 @@
/**
* @deprecated due to conflict with PHP8 parent class update
* @param Varien_Simplexml_Element $source
* @return array
* @return array|RecursiveIterator|null
*/
#[\ReturnTypeWillChange]
public function getChildren($source = null)
Expand All @@ -174,7 +174,7 @@
* Return children of all namespaces
*
* @param Varien_Simplexml_Element $source
* @return array
* @return array|RecursiveIterator|null
*/
protected static function _getChildren($source)
{
Expand Down
11 changes: 10 additions & 1 deletion app/code/core/Mage/Payment/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @category Mage
* @package Mage_Payment
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
* @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
* @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
* @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
Expand Down Expand Up @@ -158,6 +158,15 @@
</adminhtml>
<default>
<payment>
<ccsave>
<active>0</active>
<cctypes>AE,VI,MC,DI</cctypes>
<model>payment/method_ccsave</model>
<order_status>pending</order_status>
<title>Credit Card (saved)</title>
<allowspecific>0</allowspecific>
<group>offline</group>
</ccsave>
<checkmo>
<active>1</active>
<model>payment/method_checkmo</model>
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "openmage/magento-lts",
"name": "openmage-strict/openmage-future",
"description": "A fork of Magento-1 that is accepting bug fixes (backward compatible, drop in replacement for official Magento)",
"homepage": "https://www.openmage.org/",
"license": [
Expand Down Expand Up @@ -30,6 +30,7 @@
"colinmollenhour/magento-redis-session": "^3.2.0",
"components/jquery": "^3.7.1",
"cweagans/composer-patches": "^1.7",
"empiricompany/openmage_ignition": "^1.5",
"ezyang/htmlpurifier": "^4.17",
"flowjs/flowjs": "dev-master",
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
Expand Down
Loading
Loading