Skip to content

Commit d322ece

Browse files
committed
Removed Autoload.php;
Made Communicator throw SocketException on connection errors; Doc and organization fixes.
1 parent 95146f9 commit d322ece

File tree

11 files changed

+148
-310
lines changed

11 files changed

+148
-310
lines changed

RELEASE-1.0.0b3

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ Bug fixes on edge cases, and some API changes
99
* (GH #4) Client::completeRequest() now works with requests that use a callback.
1010
* Client::sendSync() now accepts requests with a tag.
1111
* Added support for non ASCII passwords.
12+
* Client now throws this package's SocketException on connection errors. The originating Transmitter exception is available in the trace.
1213
* Documentation fixes.

docs/docblox.xsd

Lines changed: 0 additions & 188 deletions
This file was deleted.

docs/doxygen.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROJECT_NAME = PEAR2_Net_RouterOS
3232
# This could be handy for archiving the generated documentation or
3333
# if some version control system is used.
3434

35-
PROJECT_NUMBER = SVN: $WCREV$
35+
PROJECT_NUMBER = GIT: $Id$
3636

3737
# Using the PROJECT_BRIEF tag one can provide an optional one line description
3838
# for a project that appears at the top of each page and should give viewer
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<docblox
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="docblox.xsd"
5-
>
2+
<phpdoc>
63
<title>PEAR2_Net_RouterOS documentation</title>
74
<parser>
85
<default-package-name>PEAR2_Net_RouterOS</default-package-name>
9-
<target>PEAR2_Net_RouterOS__DocBlox_Documentation</target>
6+
<target>PEAR2_Net_RouterOS__PhpDocumentor_Documentation</target>
107
<extensions>
118
<extension>php</extension>
129
</extensions>
@@ -15,6 +12,6 @@
1512
<directory>../src/PEAR2/Net/RouterOS</directory>
1613
</files>
1714
<transformer>
18-
<target>PEAR2_Net_RouterOS__DocBlox_Documentation</target>
15+
<target>PEAR2_Net_RouterOS__PhpDocumentor_Documentation</target>
1916
</transformer>
20-
</docblox>
17+
</phpdoc>

extrasetup.php

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,56 @@
11
<?php
2+
$extrafiles = array();
23

3-
$transmitterPackage
4-
= new \PEAR2\Pyrus\Package(
5-
__DIR__ . DIRECTORY_SEPARATOR
6-
. '../PEAR2_Net_Transmitter.git/package.xml'
4+
foreach (
5+
array(
6+
dirname(__DIR__) . DIRECTORY_SEPARATOR . 'PEAR2_Net_Transmitter.git',
7+
dirname(__DIR__) . DIRECTORY_SEPARATOR . 'PEAR2_Cache_SHM.git'
8+
) as $packageRoot
9+
) {
10+
$pkg = new \Pyrus\Package(
11+
$packageRoot . DIRECTORY_SEPARATOR . 'package.xml'
712
);
8-
unset($transmitterPackage->files['docs/docblox.xml']);
9-
unset($transmitterPackage->files['docs/doxygen.ini']);
13+
foreach (array('tests', 'docs') as $folder) {
14+
foreach (
15+
new RecursiveIteratorIterator(
16+
new RecursiveDirectoryIterator(
17+
$packageRoot . DIRECTORY_SEPARATOR . $folder,
18+
RecursiveDirectoryIterator::UNIX_PATHS
19+
),
20+
RecursiveIteratorIterator::LEAVES_ONLY
21+
) as $path
22+
) {
23+
unset($pkg->files[$path->getPathname()]);
24+
}
25+
}
26+
$extrafiles[] = $pkg;
27+
}
1028

11-
unset($transmitterPackage->files['tests/ClientTest.php']);
12-
unset($transmitterPackage->files['tests/ServerTest.php']);
13-
unset($transmitterPackage->files['tests/UnconnectedTest.php']);
14-
unset($transmitterPackage->files['tests/bootstrap.php']);
15-
unset($transmitterPackage->files['tests/phpunit.xml']);
16-
unset($transmitterPackage->files['tests/secondaryPeer.xml']);
17-
unset($transmitterPackage->files['tests/secondaryPeer.bat']);
18-
19-
$extrafiles = array($transmitterPackage);
29+
//$transmitterPackage
30+
// = new \Pyrus\Package(
31+
// __DIR__ . DIRECTORY_SEPARATOR
32+
// . '../PEAR2_Net_Transmitter.git/package.xml'
33+
// );
34+
//unset($transmitterPackage->files['docs/docblox.xml']);
35+
//unset($transmitterPackage->files['docs/doxygen.ini']);
36+
//
37+
//unset($transmitterPackage->files['tests/ClientTest.php']);
38+
//unset($transmitterPackage->files['tests/ServerTest.php']);
39+
//unset($transmitterPackage->files['tests/UnconnectedTest.php']);
40+
//unset($transmitterPackage->files['tests/bootstrap.php']);
41+
//unset($transmitterPackage->files['tests/phpunit.xml']);
42+
//unset($transmitterPackage->files['tests/secondaryPeer.xml']);
43+
//unset($transmitterPackage->files['tests/secondaryPeer.bat']);
44+
//
45+
//$shmPackage
46+
// = new \Pyrus\Package(
47+
// __DIR__ . DIRECTORY_SEPARATOR
48+
// . '../PEAR2_Cache_SHM.git/package.xml'
49+
// );
50+
//unset($shmPackage->files['docs/phpdoc.dist.xml']);
51+
//unset($shmPackage->files['docs/doxygen.ini']);
52+
//
53+
//unset($shmPackage->files['tests/bootstrap.php']);
54+
//unset($shmPackage->files['tests/phpunit.xml']);
55+
//
56+
//$extrafiles = array($transmitterPackage, $shmPackage);

0 commit comments

Comments
 (0)