瀏覽代碼

Xdebug 3.3.1 and Blackfire PHP extension incompatibility #1118

Mark Shust 1 年之前
父節點
當前提交
92e8c752a5
共有 6 個文件被更改,包括 16 次插入12 次删除
  1. 1 1
      .github/workflows/build-php-8-3.yml
  2. 5 0
      CHANGELOG.md
  3. 7 8
      README.md
  4. 1 1
      compose/compose.yaml
  5. 1 1
      images/php/8.3/Dockerfile
  6. 1 1
      images/php/8.3/conf/blackfire.ini

+ 1 - 1
.github/workflows/build-php-8-3.yml

@@ -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

+ 5 - 0
CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [46.1.1] - 2024-04-16
+
+### Fixed
+- Xdebug 3.3.1 and Blackfire PHP extension incompatibility [PR #1121](https://github.com/markshust/docker-magento/pull/1120).
+
 ## [46.1.0] - 2024-04-13
 
 ### Added

+ 7 - 8
README.md

@@ -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
 
@@ -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
 

+ 1 - 1
compose/compose.yaml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 46.1.0
+## Version 46.1.1
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux

+ 1 - 1
images/php/8.3/Dockerfile

@@ -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
 

+ 1 - 1
images/php/8.3/conf/blackfire.ini

@@ -1,2 +1,2 @@
-;extension=blackfire.so
+extension=blackfire.so
 blackfire.agent_socket=tcp://blackfire:8307