jenkins-bot has submitted this change and it was merged. Change subject: Upgrade XDebug, always enable, switch from apt to PECL ......................................................................
Upgrade XDebug, always enable, switch from apt to PECL * Upgrade XDebug from 2.1.0 to 2.2.3. Fixes at least one bug with bogus CLASSNAME entries showing instead of object members in some cases. * Always enable XDebug; it is no longer a role. * Use the PECL package. It's suggested prominently at http://xdebug.org/docs/install and is more up to date than Ubuntu's package. Change-Id: Id564d627f8a4f26731223f3fd9181a3fabd5a54f --- D puppet/manifests/roles/remote_debug.pp M puppet/modules/php/manifests/init.pp A puppet/modules/php/manifests/remote_debug.pp 3 files changed, 49 insertions(+), 30 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/manifests/roles/remote_debug.pp b/puppet/manifests/roles/remote_debug.pp deleted file mode 100644 index efea363..0000000 --- a/puppet/manifests/roles/remote_debug.pp +++ /dev/null @@ -1,29 +0,0 @@ -# == Class: role::remote_debug -# This class enables support for remote debugging of PHP code using -# Xdebug. Remote debugging allows you to interactively walk through your -# code as executes. Remote debugging is most useful when used in -# conjunction with a PHP IDE such as PhpStorm or Emacs (with Geben). -# The IDE is installed on your machine, not the Vagrant VM. -# -# -- To use, enable this role from shell: -# vagrant enable-role remote_debug -# -- In your IDE, enable "Start Listening for PHP Debug Connections" -# -- For Firefox, install -# https://addons.mozilla.org/en-US/firefox/addon/the-easiest-xdebug -# and click "Enable Debug" icon in the Add-on bar -# -- Set breakpoints -# -- Navigate to 127.0.0.1:8080/... -# -# See https://www.mediawiki.org/wiki/MediaWiki-Vagrant/Advanced_usage#MediaWiki_debugging_using_Xdebug_and_an_IDE_in_your_host -# for more information. -class role::remote_debug { - include php - - php::ini { 'remote_debug': - settings => { - 'xdebug.remote_connect_back' => 1, - 'xdebug.remote_enable' => 1, - }, - require => Package['php5-xdebug'], - } -} diff --git a/puppet/modules/php/manifests/init.pp b/puppet/modules/php/manifests/init.pp index 45054b5..6c74524 100644 --- a/puppet/modules/php/manifests/init.pp +++ b/puppet/modules/php/manifests/init.pp @@ -8,6 +8,8 @@ include ::apache include ::apache::mods::php5 + include php::remote_debug + package { [ 'php5', 'php-apc', @@ -19,7 +21,6 @@ 'php5-intl', 'php5-mcrypt', 'php5-mysql', - 'php5-xdebug' ]: ensure => present, } diff --git a/puppet/modules/php/manifests/remote_debug.pp b/puppet/modules/php/manifests/remote_debug.pp new file mode 100644 index 0000000..e8d81e1 --- /dev/null +++ b/puppet/modules/php/manifests/remote_debug.pp @@ -0,0 +1,47 @@ +# == Class: php::remote_debug +# This class enables support for remote debugging of PHP code using +# Xdebug. Remote debugging allows you to interactively walk through your +# code as executes. Remote debugging is most useful when used in +# conjunction with a PHP IDE such as PhpStorm or Emacs (with Geben). +# The IDE is installed on your machine, not the Vagrant VM. +# +# +# This was formerly a role, but is now enabled on all +# MediaWiki-Vagrant installations. +# +# To use: +# +# -- In your IDE, enable "Start Listening for PHP Debug Connections" +# -- For Firefox, install +# https://addons.mozilla.org/en-US/firefox/addon/the-easiest-xdebug +# and click "Enable Debug" icon in the Add-on bar +# -- Set breakpoints +# -- Navigate to 127.0.0.1:8080/... +# +# See https://www.mediawiki.org/wiki/MediaWiki-Vagrant/Advanced_usage#MediaWiki_debugging_using_Xdebug_and_an_IDE_in_your_host +# for more information. +class php::remote_debug { + $xdebug_extension_path = '/usr/lib/php5/20090626/xdebug.so' + + # It would be nice to use a PECL package provider. + exec { 'install xdebug': + command => 'pecl install xdebug', + require => [ Package['purge php5-xdebug'], Package['php-pear'] ], + creates => $xdebug_extension_path, + } + + # Remove apt package so it doesn't clash with PECL package + package { 'purge php5-xdebug': + name => 'php5-xdebug', + ensure => purged, + } + + php::ini { 'remote_debug': + settings => { + 'zend_extension' => $xdebug_extension_path, + 'xdebug.remote_connect_back' => 1, + 'xdebug.remote_enable' => 1, + }, + require => Exec['install xdebug'], + } +} -- To view, visit https://gerrit.wikimedia.org/r/113519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id564d627f8a4f26731223f3fd9181a3fabd5a54f Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Yurik <yu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
