[PHP-WEBMASTER] com web/rmtools: Restore composer.json generation: include/PeclExt.php

[Anatol Belski]

Commit:    2b4b5f06559216bf905fe603b9e4c92a2bc8bef0
Author:    Anatol Belski <a...@php.net>         Tue, 5 Sep 2017 17:39:00 +0200
Parents:   cdf0eb769342232549ead10fdde5212ea20d2aa5
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=2b4b5f06559216bf905fe603b9e4c92a2bc8bef0

Log:
Restore composer.json generation

Changed paths:
  M  include/PeclExt.php


Diff:
diff --git a/include/PeclExt.php b/include/PeclExt.php
index 6807396..b5df59b 100644
--- a/include/PeclExt.php
+++ b/include/PeclExt.php
@@ -332,7 +332,7 @@ class PeclExt
                if (file_exists($tmp_path . DIRECTORY_SEPARATOR . 
'composer.json')) {
                        $this->composer_json_path = $tmp_path . 
DIRECTORY_SEPARATOR . 'composer.json';
                } else if ($this->package_xml_path) {
-                       if (0) {
+                       //if (0) {
                        $package_xml_dir = dirname($this->package_xml_path);
                        $cmd = PHP_BINARY . " $this->pickle_phar convert " . 
$package_xml_dir;
                        $pickle_convert_out = shell_exec($cmd);
@@ -348,7 +348,7 @@ class PeclExt
                                        $pickle_convert_out
                                );
                        }
-                       }
+                       //}
                }
 
                $this->pkg_path = NULL;


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php