Skip to content

Commit

Permalink
Merge branch 'main' into fix/environmentLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
sreichel authored Feb 25, 2025
2 parents de18a5d + a1dbce2 commit 08756c9
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 40 deletions.
2 changes: 1 addition & 1 deletion app/Mage.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public static function getOpenMageVersionInfo(): array
if (self::getOpenMageMajorVersion() === 20) {
return [
'major' => '20',
'minor' => '12',
'minor' => '13',
'patch' => '0',
'stability' => '', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Catalog/Model/Layer.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function getFilterableAttributes()
}
}
}
usort($attributes, function ($a, $b) {
uasort($attributes, function ($a, $b) {
return $a->getPosition() - $b->getPosition();
});

Expand Down
58 changes: 29 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions docs/content/users/install/use-composer.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ Configure root directory that magento-lts will be installed to, such as `pub`, `
composer config extra.magento-root-dir pub
```

## Specify PHP engine version

This is not strictly required, but if you are running composer with a different PHP version than your target environment,
specifying the engine version will ensure that the correct dependencies are installed for your target environment,
ignoring the PHP engine used to run composer.

```bash
composer config platform.php 8.4
```

## Require `magento-core-composer-installer`

=== "PHP 8"
Expand Down
15 changes: 6 additions & 9 deletions docs/content/users/install/use-git.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ tags:

# Git (for contributors)

If you want to contribute to the project:
If you want to hack at the core and contribute to the project with a Pull Request, we're very grateful and hope you find it easy to contribute!

```bash
git init
git remote add origin https://github.com/<YOUR GIT USERNAME>/magento-lts
git pull origin main
git remote add upstream https://github.com/OpenMage/magento-lts
git pull upstream 1.9.4.x
git add -A && git commit
```
1. [Fork](https://github.com/OpenMage/magento-lts/fork) the project so you can push your commits later.
2. Clone your fork to your development host with `git clone https://github.com/<YOUR GIT USERNAME>/magento-lts`
3. Use either the [DDEV](/developers/tools/ddev/) or the [Docker Compose](/developers/tools/oneline/) development environment to hack away.
4. Commit and push your code up to your own fork from step 1.
5. Create a [Pull Request](https://github.com/OpenMage/magento-lts/compare)!

0 comments on commit 08756c9

Please sign in to comment.