Skip to content

Commit

Permalink
Merge pull request #97 from SimonFrings/ci
Browse files Browse the repository at this point in the history
Use GitHub actions for continuous integration (CI)
  • Loading branch information
clue authored Mar 31, 2021
2 parents d2d8744 + a2ecf61 commit 5cc99a1
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/.gitattributes export-ignore
/.github/workflows/ export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/examples/ export-ignore
/phpunit.xml.dist export-ignore
/phpunit.xml.legacy export-ignore
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI

on:
push:
pull_request:

jobs:
PHPUnit:
name: PHPUnit (PHP ${{ matrix.php }})
runs-on: ubuntu-20.04
strategy:
matrix:
php:
- 8.0
- 7.4
- 7.3
- 7.2
- 7.1
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: xdebug
- run: composer install
- run: vendor/bin/phpunit --coverage-text
if: ${{ matrix.php >= 7.3 }}
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
if: ${{ matrix.php < 7.3 }}

PHPUnit-hhvm:
name: PHPUnit (HHVM)
runs-on: ubuntu-18.04
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: azjezz/setup-hhvm@v1
with:
version: lts-3.30
- run: hhvm $(which composer) require phpunit/phpunit:^5 --dev --no-interaction
- run: hhvm $(which composer) install
- run: hhvm vendor/bin/phpunit
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/vendor
/vendor/
/composer.lock
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# clue/reactphp-socks [![Build Status](https://travis-ci.org/clue/reactphp-socks.svg?branch=master)](https://travis-ci.org/clue/reactphp-socks)
# clue/reactphp-socks

[![CI status](https://github.com/clue/reactphp-socks/workflows/CI/badge.svg)](https://github.com/clue/reactphp-socks/actions)

Async SOCKS proxy connector client and server implementation, tunnel any TCP/IP-based
protocol through a SOCKS5 or SOCKS4(a) proxy server, built on top of
Expand Down Expand Up @@ -1025,7 +1027,7 @@ $ composer require clue/socks-react:^1.2
See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.

This project aims to run on any platform and thus does not require any PHP
extensions and supports running on legacy PHP 5.3 through current PHP 7+ and
extensions and supports running on legacy PHP 5.3 through current PHP 8+ and
HHVM.
It's *highly recommended to use PHP 7+* for this project.

Expand Down
19 changes: 11 additions & 8 deletions tests/FunctionalTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public function setUpClientServer()
/** @group internet */
public function testConnection()
{
// max_nesting_level was set to 100 for PHP Versions < 5.4 which resulted in failing test for legacy PHP
ini_set('xdebug.max_nesting_level', 256);

$this->assertResolveStream($this->client->connect('www.google.com:80'));
}

Expand Down Expand Up @@ -92,8 +95,8 @@ public function testConnectionSocks5()
/** @group internet */
public function testConnectionSocksOverTls()
{
if (!function_exists('stream_socket_enable_crypto')) {
$this->markTestSkipped('Required function does not exist in your environment (HHVM?)');
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM');
}

$socket = new \React\Socket\Server('tls://127.0.0.1:0', $this->loop, array('tls' => array(
Expand All @@ -117,8 +120,8 @@ public function testConnectionSocksOverTls()
*/
public function testConnectionSocksOverTlsUsesPeerNameFromSocksUri()
{
if (!function_exists('stream_socket_enable_crypto')) {
$this->markTestSkipped('Required function does not exist in your environment (HHVM?)');
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM');
}

$socket = new \React\Socket\Server('tls://127.0.0.1:0', $this->loop, array('tls' => array(
Expand Down Expand Up @@ -421,8 +424,8 @@ public function testConnectorInvalidUnboundPortTimeout()
/** @group internet */
public function testSecureConnectorOkay()
{
if (!function_exists('stream_socket_enable_crypto')) {
$this->markTestSkipped('Required function does not exist in your environment (HHVM?)');
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM');
}

$ssl = new SecureConnector($this->client, $this->loop);
Expand All @@ -445,8 +448,8 @@ public function testSecureConnectorToBadSslWithVerifyFails()
/** @group internet */
public function testSecureConnectorToBadSslWithoutVerifyWorks()
{
if (!function_exists('stream_socket_enable_crypto')) {
$this->markTestSkipped('Required function does not exist in your environment (HHVM?)');
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM');
}

$ssl = new SecureConnector($this->client, $this->loop, array('verify_peer' => false));
Expand Down

0 comments on commit 5cc99a1

Please sign in to comment.