Skip to content

Commit 08756c9

Browse files
authored
Merge branch 'main' into fix/environmentLoader
2 parents de18a5d + a1dbce2 commit 08756c9

File tree

5 files changed

+47
-40
lines changed

5 files changed

+47
-40
lines changed

app/Mage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public static function getOpenMageVersionInfo(): array
213213
if (self::getOpenMageMajorVersion() === 20) {
214214
return [
215215
'major' => '20',
216-
'minor' => '12',
216+
'minor' => '13',
217217
'patch' => '0',
218218
'stability' => '', // beta,alpha,rc
219219
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9

app/code/core/Mage/Catalog/Model/Layer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function getFilterableAttributes()
219219
}
220220
}
221221
}
222-
usort($attributes, function ($a, $b) {
222+
uasort($attributes, function ($a, $b) {
223223
return $a->getPosition() - $b->getPosition();
224224
});
225225

composer.lock

+29-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/content/users/install/use-composer.md

+10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ Configure root directory that magento-lts will be installed to, such as `pub`, `
3030
composer config extra.magento-root-dir pub
3131
```
3232

33+
## Specify PHP engine version
34+
35+
This is not strictly required, but if you are running composer with a different PHP version than your target environment,
36+
specifying the engine version will ensure that the correct dependencies are installed for your target environment,
37+
ignoring the PHP engine used to run composer.
38+
39+
```bash
40+
composer config platform.php 8.4
41+
```
42+
3343
## Require `magento-core-composer-installer`
3444

3545
=== "PHP 8"

docs/content/users/install/use-git.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ tags:
66

77
# Git (for contributors)
88

9-
If you want to contribute to the project:
9+
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!
1010

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

0 commit comments

Comments
 (0)