Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c039678

Browse files
sagikazarmarksagikazarmark
committed
Merge branch 'release/2.0.2'
2 parents 37f88fb + c68f356 commit c039678

48 files changed

Lines changed: 114 additions & 436 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ php:
33
- 5.4
44
- 5.5
55

6-
script: vendor/bin/codecept run --coverage --xml
6+
script: vendor/bin/codecept run --coverage-xml
77

88
before_script:
99
- wget https://scrutinizer-ci.com/ocular.phar
10-
- composer install --dev --prefer-source
10+
- composer install --prefer-source
1111
- resources/supervisor.sh
1212
- sudo supervisord -c resources/supervisord.conf
1313

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,14 @@ All the connectors that extends `AbstractXmlrpcConnector` use PHP XML-RPC extens
196196
You will also have to make sure that you always call the functions with correct parameters. `ZendConnector` will trigger an error when incorrect parameters are passed. See [this](https://github.com/zendframework/zf2/issues/6455) issue for details. (Probably this won't change in near future based on my inspections of the code.) Other connectors will throw a `SupervisorException`.
197197

198198

199+
## Bundles
200+
201+
Here is a list of framework specific bundle packages:
202+
203+
* [HumusSupervisorModule](https://github.com/prolic/HumusSupervisorModule) *(Zend Framework 2)*
204+
* [Fuel Supervisor](https://github.com/indigophp/fuel-supervisor) *(FuelPHP 1.x)*
205+
206+
199207
## Testing
200208

201209
``` bash

‎codeception.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ paths:
66
helpers: tests/_support
77
settings:
88
bootstrap: _bootstrap.php
9-
suite_class: \PHPUnit_Framework_TestSuite
109
colors: true
1110
memory_limit: 1024M
12-
log: true
1311
coverage:
1412
enabled: true
1513
include:

‎composer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
"psr-4": {
3737
"Indigo\\Supervisor\\": "src/"
3838
}
39-
}
39+
},
40+
"prefer-stable": true,
41+
"minimum-stability": "dev"
4042
}

‎src/Configuration.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,10 @@ protected function parseIniSection($class, array $name, array $section)
268268

269269
/**
270270
* Alias to render()
271+
*
272+
* @return string
271273
*/
272-
public function __tostring()
274+
public function __toString()
273275
{
274276
return $this->render();
275277
}

‎src/Connector/AbstractConnector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Indigo\Supervisor\Connector;
1313

1414
/**
15-
* Abstract Connector class
15+
* Abstract Connector
1616
*
1717
* @author Márk Sági-Kazár <[email protected]>
1818
*/
@@ -40,15 +40,15 @@ abstract class AbstractConnector implements ConnectorInterface
4040
protected $local;
4141

4242
/**
43-
* {@inheritdocs}
43+
* {@inheritdoc}
4444
*/
4545
public function isLocal()
4646
{
4747
return $this->local;
4848
}
4949

5050
/**
51-
* {@inheritdocs}
51+
* {@inheritdoc}
5252
*/
5353
public function setCredentials($username, $password)
5454
{

‎src/Connector/AbstractXmlrpcConnector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use UnexpectedValueException;
1616

1717
/**
18-
* Abstract XMLRPC Connector class
18+
* Abstract XMLRPC Connector
1919
*
2020
* Uses XMLRPC extension to parse messages
2121
*

‎src/Connector/Guzzle3Connector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Guzzle\Http\Stream\StreamInterface;
1919

2020
/**
21-
* Guzzle3 connector class
21+
* Guzzle3 Connector
2222
*
2323
* @author Márk Sági-Kazár <[email protected]>
2424
*/
@@ -68,7 +68,7 @@ public function setClient(ClientInterface $client)
6868
}
6969

7070
/**
71-
* {@inheritdocs}
71+
* {@inheritdoc}
7272
*/
7373
public function call($namespace, $method, array $arguments = array())
7474
{

‎src/Connector/GuzzleConnector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use GuzzleHttp\Stream\StreamInterface;
1919

2020
/**
21-
* Guzzle connector class
21+
* Guzzle Connector
2222
*
2323
* @author Márk Sági-Kazár <[email protected]>
2424
*/
@@ -68,7 +68,7 @@ public function setClient(ClientInterface $client)
6868
}
6969

7070
/**
71-
* {@inheritdocs}
71+
* {@inheritdoc}
7272
*/
7373
public function call($namespace, $method, array $arguments = array())
7474
{
@@ -82,7 +82,7 @@ public function call($namespace, $method, array $arguments = array())
8282
}
8383

8484
/**
85-
* {@inheritdocs}
85+
* {@inheritdoc}
8686
*
8787
* @return StreamInterface
8888
*/

‎src/Connector/ZendConnector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Indigo\Supervisor\Exception\SupervisorException;
1818

1919
/**
20-
* Zend connector class
20+
* Zend Connector
2121
*
2222
* @author Márk Sági-Kazár <[email protected]>
2323
*/
@@ -41,7 +41,7 @@ public function __construct(Client $client)
4141
}
4242

4343
/**
44-
* {@inheritdocs}
44+
* {@inheritdoc}
4545
*/
4646
public function setCredentials($username, $password)
4747
{
@@ -75,7 +75,7 @@ public function setClient(Client $client)
7575
}
7676

7777
/**
78-
* {@inheritdocs}
78+
* {@inheritdoc}
7979
*/
8080
public function call($namespace, $method, array $arguments = array())
8181
{

0 commit comments

Comments
 (0)