Skip to content

Commit

Permalink
Merge pull request #1122 from markshust/feature/xdebug-blackfire
Browse files Browse the repository at this point in the history
Xdebug 3.3.1 and Blackfire PHP extension incompatibility #1118
  • Loading branch information
markshust authored Apr 16, 2024
2 parents 7a22435 + 507c1c7 commit 975a49c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-php-8-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
push: true
tags: |
markoshust/magento-php:8.3-fpm
markoshust/magento-php:8.3-fpm-1
markoshust/magento-php:8.3-fpm-2
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ View Dockerfiles for the latest tags:
- [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
- [`8.1-fpm`, `8.1-fpm-5`](images/php/8.1)
- [`8.2-fpm`, `8.2-fpm-4`](images/php/8.2)
- [`8.3-fpm`, `8.3-fpm-1`](images/php/8.3)
- [`8.3-fpm`, `8.3-fpm-2`](images/php/8.3)
- [markoshust/magento-opensearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-opensearch/)
- [`1.2`, `1.2-0`](images/opensearch/1.2)
- [`2.5`, `2.5-1`](images/opensearch/2.5)
Expand Down Expand Up @@ -757,9 +757,7 @@ Additional information of how to work with SPX is available at https://www.youtu

## Known Issues

### Xdebug & Blackfire incompatibility

There is an outstanding bug when Xdebug runs alongside Blackfire in PHP 8.3. See https://github.com/markshust/docker-magento/issues/1118 for more info.
There are currently no large known issues or workarounds needed to use docker-magento with your Magento project. If you find any, please [report them](https://github.com/markshust/docker-magento/issues)!

## Credits

Expand All @@ -771,13 +769,14 @@ This course is sponsored by <a href="https://m.academy" target="_blank">M.academ

### Mark Shust

My name is Mark Shust and I'm the creator of this repo. I'm a <a href="http://www.zend.com/en/yellow-pages/ZEND014633" target="_blank">Zend Certified Engineer</a> and <a href="https://www.youracclaim.com/users/mark-shust" target="_blank">Adobe Certified Magento Developer</a>, and have been involved since the early days of Magento (0.8!). I'm no longer available for consulting, but am creating course content full-time at <a href="https://m.academy" target="_blank">M.academy</a>.
My name is Mark Shust and I'm the creator of this repo. I'm a <a href="https://www.credly.com/users/mark-shust/badges" target="_blank">6X Adobe Commerce Certified Developer</a> and have been involved with Magento since the early days (v0.8!). I create technical education courses full-time for my company, <a href="https://m.academy" target="_blank">M.academy</a>.

- <a href="https://www.linkedin.com/in/MarkShust/" target="_blank">πŸ”— Connect with me on LinkedIn</a>
- <a href="https://m.academy/courses" target="_blank">πŸ–₯️ See my Magento lessons & courses</a>
- <a href="https://m.academy/articles" target="_blank">πŸ“– Read my technical articles</a>
- <a href="https://youtube.com/markshust" target="_blank">πŸŽ₯ Watch my YouTube videos</a>
- <a href="https://twitter.com/MarkShust" target="_blank">🐦 Follow me on Twitter</a>
- <a href="https://markshust.com" target="_blank">πŸ“– Read my blog</a>
- <a href="mailto:mark@shust.com">πŸ’Œ Contact me</a>
- <a href="https://www.linkedin.com/in/MarkShust/" target="_blank">πŸ”— Connect on LinkedIn</a>
- <a href="https://twitter.com/MarkShust" target="_blank">🐦 Follow me on X</a>
- <a href="mailto:mark@m.academy">πŸ’Œ Contact me</a>

## License

Expand Down
2 changes: 1 addition & 1 deletion images/php/8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN pecl channel-update pecl.php.net && pecl install \
redis-6.0.2 \
ssh2-1.3.1 \
swoole-5.1.1 \
xdebug-3.3.1 \
xdebug-3.3.2 \
&& pecl clear-cache \
&& rm -rf /tmp/pear

Expand Down
2 changes: 1 addition & 1 deletion images/php/8.3/conf/blackfire.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
;extension=blackfire.so
extension=blackfire.so
blackfire.agent_socket=tcp://blackfire:8307

0 comments on commit 975a49c

Please sign in to comment.