Skip to content

Commit 5abea5c

Browse files
committed
Packaging fix and regeneration of package.xml for 1.0.0b2.
1 parent 500e931 commit 5abea5c

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

package.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@ This package abstracts this away, so that when you want to get exactly N amount
1313
<email>[email protected]</email>
1414
<active>yes</active>
1515
</lead>
16-
<date>2016-11-07</date>
17-
<time>03:01:58</time>
16+
<date>2017-05-13</date>
17+
<time>16:35:14</time>
1818
<version>
19-
<release>1.0.0b1</release>
19+
<release>1.0.0b2</release>
2020
<api>1.0.0</api>
2121
</version>
2222
<stability>
2323
<release>beta</release>
2424
<api>stable</api>
2525
</stability>
2626
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL License 2.1</license>
27-
<notes>* Fixed a streaming issue with newer PHP 5.6 versions and later.
28-
* Stream::setIsBlocking() is only implicitly called if needed (i.e. for encrypted connections), ensuring compatibility with web hosts that for bizzare reasons have disabled stream_set_blocking().
29-
* Doc and test fixes that now ensure large code coverage.</notes>
27+
<notes>* Fixed &quot;failed to parse address&quot; error that occurs in patched PHP versions for Debian 7 and Ubuntu 16.04.
28+
- **NOTE:** Persistent connections still fail in those environments, and there's no possible workaround, short of getting a non-patched PHP version or upgrading to Debian 8 or Ubuntu 16.10.</notes>
3029
<contents>
3130
<dir name="/">
3231
<dir name="docs" baseinstalldir="/">
@@ -40,7 +39,9 @@ This package abstracts this away, so that when you want to get exactly N amount
4039
<file role="doc" name="phpdoc.dist.xml">
4140
<tasks:replace type="pear-config" to="php_dir" from="../src"/>
4241
</file>
43-
<file role="doc" name="sami.php"/>
42+
<file role="doc" name="sami.php">
43+
<tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
44+
</file>
4445
</dir>
4546
<dir name="src" baseinstalldir="/">
4647
<dir name="PEAR2">

packagexmlsetup.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676

7777
$oldCwd = getcwd();
7878
chdir(__DIR__);
79+
$package->setRawRelease('php', '');
80+
$release = $package->getReleaseToInstall('php');
7981
foreach (new RecursiveIteratorIterator(
8082
new RecursiveDirectoryIterator(
8183
'.',
@@ -84,8 +86,12 @@
8486
),
8587
RecursiveIteratorIterator::LEAVES_ONLY
8688
) as $path) {
87-
$filename = substr($path->getPathname(), 2);
88-
$cFilename = str_replace('src/', 'php/', $filename);
89+
if ('.git' === $path->getFilename()) {
90+
continue;
91+
}
92+
93+
$filename = substr($path->getPathname(), 2);
94+
$cFilename = str_replace('src/', 'php/', $filename);
8995

9096
if (isset($package->files[$filename])) {
9197
$parsedFilename = pathinfo($filename);
@@ -107,7 +113,7 @@
107113
$as = substr($as, 0, -4);
108114
}
109115
}
110-
$package->getReleaseToInstall('php')->installAs($filename, $as);
116+
$release->installAs($filename, $as);
111117

112118
$contents = file_get_contents($filename);
113119
foreach ($config['replace'] as $from => $attribs) {

0 commit comments

Comments
 (0)