jenkins-bot has submitted this change and it was merged.
Change subject: Drop support for syck-pecl
......................................................................
Drop support for syck-pecl
It doesn't seem to even compile with recent PHP, and was partially
ignored already.
Change-Id: I4095d879d2853f8d90f053eb9b454ddacd3b809d
---
M Translate.php
M scripts/yaml-tests.php
M utils/TranslateYaml.php
3 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.php b/Translate.php
index d4101b4..fd3f6d3 100644
--- a/Translate.php
+++ b/Translate.php
@@ -552,7 +552,7 @@
# ==== YAML driver ====
# <source lang=php>
/**
- * Currently supported YAML drivers are spyc and syck and sycl-pecl.
+ * Currently supported YAML drivers are spyc and syck.
*
* For syck we're shelling out to perl. So you need:
*
@@ -568,8 +568,6 @@
* For the shell to work, you also need an en.UTF-8 locale installed on your
system.
* add a line "en.UTF-8" to your /etc/locale.gen or uncomment an existing one
and run locale-gen
* if you do not have it already.
- *
- * For syck-pecl you need libsyck and pecl install syck-beta
*/
$GLOBALS['wgTranslateYamlLibrary'] = 'spyc';
diff --git a/scripts/yaml-tests.php b/scripts/yaml-tests.php
index 12b55c4..a1a44bc 100644
--- a/scripts/yaml-tests.php
+++ b/scripts/yaml-tests.php
@@ -31,7 +31,7 @@
$mems = array();
$mempeaks = array();
- foreach ( array( 'syck', 'spyc', 'syck-pecl' ) as $driver ) {
+ foreach ( array( 'syck', 'spyc' ) as $driver ) {
$mempeaks[$driver] = -memory_get_peak_usage( true );
$mems[$driver] = -memory_get_usage( true );
$times[$driver] = -microtime( true );
diff --git a/utils/TranslateYaml.php b/utils/TranslateYaml.php
index 1038563..a6dd1c5 100644
--- a/utils/TranslateYaml.php
+++ b/utils/TranslateYaml.php
@@ -85,10 +85,6 @@
$yaml = self::syckLoad( $text );
return self::fixSyckBooleans( $yaml );
- case 'syck-pecl':
- $text = preg_replace(
'~^(\s*)no(\s*:\s*[a-zA-Z-_]+\s*)$~m', '\1"no"\2', $text );
-
- return syck_load( $text );
default:
throw new MWException( "Unknown Yaml library" );
}
@@ -140,9 +136,6 @@
require_once __DIR__ . '/../libs/spyc/spyc.php';
return Spyc::YAMLDump( $text );
- case 'syck-pecl':
- // Just horrible output
- // return syck_dump( $text );
case 'syck':
return self::syckDump( $text );
default:
--
To view, visit https://gerrit.wikimedia.org/r/147174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4095d879d2853f8d90f053eb9b454ddacd3b809d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
