Skip to content

Commit

Permalink
Merge pull request #134 from mezzio/renovate/php
Browse files Browse the repository at this point in the history
Update dependency php to ~8.1.0 || ~8.2.0 || ~8.3.0
  • Loading branch information
Xerkus authored Jan 8, 2024
2 parents d3b2319 + ace49e4 commit 8577458
Show file tree
Hide file tree
Showing 9 changed files with 556 additions and 595 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.phpcs-cache
/.psalm-cache
/.phpunit.result.cache
/clover.xml
/coveralls-upload.json
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
[![Build Status](https://github.com/mezzio/mezzio-skeleton/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/mezzio/mezzio-skeleton/actions/workflows/continuous-integration.yml)

> ## 🇷🇺 Русским гражданам
>
>
> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
>
>
> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
>
>
> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
>
>
> ## 🇺🇸 To Citizens of Russia
>
>
> We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism.
>
>
> One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences.
>
>
> You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
*Begin developing PSR-15 middleware applications in seconds!*
Expand Down Expand Up @@ -59,7 +59,7 @@ You can then browse to http://localhost:8080.
There is a feature to install alternative packages: Instead of entering one of
the selection **you can actually type the package name and version**.

> ```
> ```text
> Which template engine do you want to use?
> [1] Plates
> [2] Twig
Expand Down Expand Up @@ -88,8 +88,8 @@ so far can be solved by `self-update` and `clear-cache`.

If neither of the above help, you might face more serious issues:

- Info about the [zlib_decode error](https://github.com/composer/composer/issues/4121).
- Info and solutions for [composer degraded mode](https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode).
* Info about the [zlib_decode error](https://github.com/composer/composer/issues/4121).
* Info and solutions for [composer degraded mode](https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode).

## Application Development Mode Tool

Expand Down
12 changes: 8 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"laminas/laminas-component-installer": true
},
"platform": {
"php": "8.0.99"
"php": "8.1.99"
}
},
"extra": {
Expand All @@ -44,7 +44,7 @@
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"composer/package-versions-deprecated": "^1.10.99",
"laminas/laminas-component-installer": "^2.6 || ^3.0",
"laminas/laminas-config-aggregator": "^1.6",
Expand Down Expand Up @@ -72,7 +72,7 @@
"psalm/plugin-phpunit": "^0.18.0",
"mezzio/mezzio-tooling": "^2.8",
"roave/security-advisories": "dev-master",
"vimeo/psalm": "^5.0"
"vimeo/psalm": "^5.18"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -116,10 +116,14 @@
"Composer\\Config::disableProcessTimeout",
"php -S 0.0.0.0:8080 -t public/"
],
"static-analysis": "psalm --stats",
"static-analysis-update-baseline": "psalm --stats --update-baseline",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"scripts-descriptions": {
"clear-config-cache": "Clears merged config cache. Required for config changes to be applied."
"clear-config-cache": "Clears merged config cache. Required for config changes to be applied.",
"static-analysis": "Run static analysis tool Psalm.",
"static-analysis-update-baseline": "Run static analysis tool Psalm and update baseline."
}
}
Loading

0 comments on commit 8577458

Please sign in to comment.