Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use GitHub actions for continuous integration (CI) #38

Merged
merged 2 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/ export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/examples export-ignore
/phpunit.xml.dist export-ignore
/phpunit.xml.legacy export-ignore
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI

on:
push:
pull_request:

jobs:
PHPUnit:
name: PHPUnit (PHP ${{ matrix.php }})
runs-on: ubuntu-20.04
strategy:
matrix:
php:
- 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) install
- run: hhvm vendor/bin/phpunit
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datagram

[![Build Status](https://travis-ci.org/reactphp/datagram.svg?branch=master)](https://travis-ci.org/reactphp/datagram)
[![CI status](https://github.com/reactphp/datagram/workflows/CI/badge.svg)](https://github.com/reactphp/datagram/actions)

Event-driven UDP datagram socket client and server for [ReactPHP](https://reactphp.org).

Expand Down
4 changes: 0 additions & 4 deletions src/Buffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ public function close()

public function end()
{
if ($this->writable === false) {
return;
}

$this->writable = false;

if (!$this->outgoing) {
Expand Down
5 changes: 2 additions & 3 deletions src/Socket.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,10 @@ private function sanitizeAddress($address)
return null;
}

// this is an IPv6 address which includes colons but no square brackets
// check if this is an IPv6 address which includes multiple colons but no square brackets (PHP < 7.3)
$pos = \strrpos($address, ':');
if ($pos !== false && \strpos($address, ':') < $pos && \substr($address, 0, 1) !== '[') {
$port = \substr($address, $pos + 1);
$address = '[' . \substr($address, 0, $pos) . ']:' . $port;
$address = '[' . \substr($address, 0, $pos) . ']:' . \substr($address, $pos + 1); // @codeCoverageIgnore
}
return $address;
}
Expand Down
72 changes: 72 additions & 0 deletions tests/BufferTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

namespace React\Tests\Datagram;

use PHPUnit\Framework\TestCase;
use React\Datagram\Buffer;

class BufferTest extends TestCase
{
public function testSendAddsSocketToLoop()
{
$socket = stream_socket_client('udp://127.0.0.1:8000');

$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$loop->expects($this->once())->method('addWriteStream')->with($socket);

$client = new Buffer($loop, $socket);

$client->send('foo');
}

public function testSendAfterCloseIsNoop()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$loop->expects($this->never())->method('addWriteStream');

$socket = stream_socket_client('udp://127.0.0.1:8000');

$client = new Buffer($loop, $socket);

$client->close();
$client->send('foo');
}

public function testCloseAfterSendAddsSocketToLoopRemovesSocketFromLoopAgain()
{
$socket = stream_socket_client('udp://127.0.0.1:8000');

$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$loop->expects($this->once())->method('addWriteStream')->with($socket);
$loop->expects($this->once())->method('removeWriteStream')->with($socket);

$client = new Buffer($loop, $socket);

$client->send('foo');
$client->close();
}

public function testCloseTwiceEmitsCloseEventOnce()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();

$socket = stream_socket_client('udp://127.0.0.1:8000');

$client = new Buffer($loop, $socket);

$closed = 0;
$client->on('close', function () use (&$closed) {
++$closed;
});

$this->assertEquals(0, $closed);

$client->close();

$this->assertEquals(1, $closed);

$client->close();

$this->assertEquals(1, $closed);
}
}