Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: reactphp/promise-timer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: reactphp/promise-timer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.x
Choose a head ref

Commits on Oct 2, 2017

  1. README improvements

    * Adjust title
    * Move travis badge to new line
    * Fix ReactPHP spelling and use https for link
    * Adjust license section with link to LICENSE
    jsor committed Oct 2, 2017
    Copy the full SHA
    2d48218 View commit details
  2. Merge pull request #28 from jsor-labs/readme-improvements

    README improvements
    WyriHaximus authored Oct 2, 2017
    Copy the full SHA
    8046965 View commit details

Commits on Dec 22, 2017

  1. Copy the full SHA
    7306dc7 View commit details
  2. Copy the full SHA
    3114a12 View commit details
  3. Merge pull request #30 from clue-labs/phpunit

    Forward compatiblity with PHPUnit 6
    jsor authored Dec 22, 2017
    Copy the full SHA
    2d3e91c View commit details
  4. Merge pull request #31 from clue-labs/loop

    Fix test suite forward compatibility with upcoming EventLoop releases
    WyriHaximus authored Dec 22, 2017
    Copy the full SHA
    2a9970f View commit details
  5. Prepare v1.2.1 release

    clue committed Dec 22, 2017
    Copy the full SHA
    9b4cd9c View commit details

Commits on Apr 22, 2018

  1. Copy the full SHA
    a460fe9 View commit details

Commits on Apr 23, 2018

  1. Merge pull request #32 from clue-labs/memory

    Improve memory consumption by cleaning up unneeded references
    WyriHaximus authored Apr 23, 2018
    Copy the full SHA
    b2bdbd1 View commit details

Commits on Apr 24, 2018

  1. Prepare v1.3.0 release

    clue committed Apr 24, 2018
    Copy the full SHA
    604513e View commit details

Commits on Jun 11, 2018

  1. Copy the full SHA
    d972649 View commit details
  2. Merge pull request #33 from clue-labs/garbage

    Improve memory consumption by cleaning up garbage references
    jsor authored Jun 11, 2018
    Copy the full SHA
    a106fe0 View commit details
  3. Prepare v1.4.0 release

    clue committed Jun 11, 2018
    Copy the full SHA
    c217811 View commit details

Commits on Jun 13, 2018

  1. Copy the full SHA
    28dc64e View commit details
  2. Merge pull request #34 from clue-labs/garbage

    Improve memory consumption by cleaning up garbage references to pending promise without canceller
    WyriHaximus authored Jun 13, 2018
    Copy the full SHA
    170fb93 View commit details
  3. Prepare v1.5.0 release

    clue committed Jun 13, 2018
    Copy the full SHA
    a112069 View commit details

Commits on Aug 8, 2018

  1. Update README.md

    typo
    aak74 authored Aug 8, 2018
    Copy the full SHA
    8c1da5f View commit details
  2. Merge pull request #35 from aak74/patch-1

    Update README.md
    WyriHaximus authored Aug 8, 2018
    Copy the full SHA
    621dbaf View commit details

Commits on Mar 21, 2019

  1. Copy the full SHA
    2833a54 View commit details

Commits on Mar 27, 2019

  1. Merge pull request #36 from Niko9911/patch-1

    Check if the function is declared before declaring it.
    clue authored Mar 27, 2019
    Copy the full SHA
    d19fe5d View commit details
  2. Prepare v1.5.1 release

    WyriHaximus committed Mar 27, 2019
    Copy the full SHA
    35fb910 View commit details

Commits on Oct 8, 2019

  1. Copy the full SHA
    38f3c85 View commit details
  2. Merge pull request #38 from WyriHaximus-labs/test-php-7.2-and-7.3

    Test PHP 7.2 and 7.3 on Travis
    jsor authored Oct 8, 2019
    Copy the full SHA
    9784e34 View commit details

Commits on Dec 2, 2019

  1. Copy the full SHA
    0f97d34 View commit details

Commits on Dec 7, 2019

  1. Merge pull request #39 from reedy/gitattributes

    Add .gitattributes to exclude dev files from exports
    WyriHaximus authored Dec 7, 2019
    Copy the full SHA
    0f6e328 View commit details

Commits on Mar 4, 2020

  1. Copy the full SHA
    53313fa View commit details

Commits on Mar 5, 2020

  1. Merge pull request #41 from clue-labs/php7.4

    Run tests on PHP 7.4 and simplify test matrix
    jsor authored Mar 5, 2020
    Copy the full SHA
    fda8533 View commit details

Commits on Apr 27, 2020

  1. Copy the full SHA
    fb261f8 View commit details

Commits on Apr 28, 2020

  1. Merge pull request #37 from WyriHaximus-labs/promise-3

    Forward compatibility with react/promise 3
    jsor authored Apr 28, 2020
    Copy the full SHA
    8cec07f View commit details

Commits on Jul 3, 2020

  1. Run tests on PHPUnit 9

    SimonFrings committed Jul 3, 2020
    Copy the full SHA
    9abf79c View commit details
  2. Clean up test suite

    SimonFrings committed Jul 3, 2020
    Copy the full SHA
    2dafff7 View commit details
  3. Merge pull request #42 from SimonFrings/tests

    Run tests on PHPUnit 9 and clean up test suite
    jsor authored Jul 3, 2020
    Copy the full SHA
    c27878c View commit details

Commits on Jul 10, 2020

  1. Prepare v1.6.0 release

    clue committed Jul 10, 2020
    Copy the full SHA
    daee9ba View commit details

Commits on Aug 24, 2020

  1. Add full core team to the license

    Added the full core team in order of joining the team
    WyriHaximus committed Aug 24, 2020
    Copy the full SHA
    3c642c7 View commit details
  2. Copy the full SHA
    91864b7 View commit details

Commits on Aug 26, 2020

  1. Merge pull request #43 from WyriHaximus-secret-labs/add-full-core-tea…

    …m-to-license
    
    Add full core team to the license
    WyriHaximus authored Aug 26, 2020
    Copy the full SHA
    1b5883f View commit details

Commits on Sep 23, 2020

  1. Copy the full SHA
    99892aa View commit details

Commits on Sep 27, 2020

  1. Merge pull request #44 from SimonFrings/tests

    Update PHPUnit configuration schema for PHPUnit 9.3
    jsor authored Sep 27, 2020
    Copy the full SHA
    272db30 View commit details

Commits on Feb 2, 2021

  1. Use GitHub actions for continuous integration (CI)

    Bye bye Travis CI, you've served us well.
    SimonFrings committed Feb 2, 2021
    Copy the full SHA
    c9ed76e View commit details
  2. Support PHP 8

    SimonFrings committed Feb 2, 2021
    Copy the full SHA
    039e8c0 View commit details
  3. Merge pull request #45 from SimonFrings/ci

    Use GitHub actions for continuous integration (CI)
    WyriHaximus authored Feb 2, 2021
    Copy the full SHA
    f2fe144 View commit details

Commits on Jul 6, 2021

  1. Copy the full SHA
    0f73d46 View commit details
  2. Copy the full SHA
    59fc300 View commit details

Commits on Jul 11, 2021

  1. Merge pull request #46 from clue-labs/default-loop

    Simplify usage by supporting new default loop
    clue authored Jul 11, 2021
    Copy the full SHA
    bebdd4a View commit details
  2. Prepare v1.7.0 release

    clue committed Jul 11, 2021
    Copy the full SHA
    607dd79 View commit details

Commits on Oct 19, 2021

  1. Copy the full SHA
    ff4124f View commit details
  2. Copy the full SHA
    86686c0 View commit details

Commits on Nov 15, 2021

  1. Support PHP 8.1

    SimonFrings committed Nov 15, 2021
    Copy the full SHA
    d616210 View commit details

Commits on Nov 16, 2021

  1. Merge pull request #48 from SimonFrings/php

    Support PHP 8.1
    WyriHaximus authored Nov 16, 2021
    Copy the full SHA
    7097b88 View commit details

Commits on Nov 29, 2021

  1. Copy the full SHA
    12052f0 View commit details
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
/phpunit.xml.dist export-ignore
/phpunit.xml.legacy export-ignore
/tests export-ignore
54 changes: 54 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: CI

on:
push:
pull_request:

jobs:
PHPUnit:
name: PHPUnit (PHP ${{ matrix.php }})
runs-on: ubuntu-22.04
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
- 7.4
- 7.3
- 7.2
- 7.1
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: xdebug
ini-file: development
- 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-22.04
continue-on-error: true
steps:
- uses: actions/checkout@v4
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
- name: Run hhvm composer.phar require react/promise:^2 # downgrade Promise for HHVM
uses: docker://hhvm/hhvm:3.30-lts-latest
with:
args: hhvm composer.phar require react/promise:^2
- name: Run hhvm vendor/bin/phpunit
uses: docker://hhvm/hhvm:3.30-lts-latest
with:
args: hhvm vendor/bin/phpunit
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

114 changes: 114 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,119 @@
# Changelog

## 1.11.0 (2024-06-04)

* Feature: Improve PHP 8.4+ support by avoiding implicitly nullable type declarations.
(#70 by @clue)

* Feature: Full PHP 8.3 compatibility.
(#68 by @clue)

## 1.10.0 (2023-07-20)

* Feature: Use Promise v3 template types.
(#67 by @clue and #63 and #64 by @WyriHaximus)

* Minor documentation improvements.
(#59 by @nhedger)

* Improve test suite, avoid unhandled promise rejections and report failed assertions.
(#66 and #62 by @clue and #61 by @WyriHaximus)

## 1.9.0 (2022-06-13)

* Feature: Improve forward compatibility with upcoming Promise v3 API.
(#54 and #55 by @clue)

* Minor documentation improvements for upcoming Promise v3.
(#58 by @clue and #56 by @SimonFrings)

* Improve test suite, fix legacy HHVM build by downgrading Composer.
(#57 by @SimonFrings)

## 1.8.0 (2021-12-06)

* Feature: Add new `sleep()` function and deprecate `resolve()` and `reject()` functions.
(#51 by @clue)

```php
// deprecated
React\Promise\Timer\resolve($time);
React\Promise\Timer\reject($time);

// new
React\Promise\Timer\sleep($time);
```

* Feature: Support PHP 8.1 release.
(#50 by @Thomas-Gelf, #52 by @clue and #48 by @SimonFrings)

* Improve API documentation and add parameter types and return types.
(#49 by @clue and #47 by @SimonFrings)

## 1.7.0 (2021-07-11)

A major new feature release, see [**release announcement**](https://clue.engineering/2021/announcing-reactphp-default-loop).

* Feature: Simplify usage by supporting new [default loop](https://reactphp.org/event-loop/#loop).
(#46 by @clue)

```php
// old (still supported)
$promise = timeout($promise, $time, $loop);
$promise = resolve($time, $loop);
$promise = reject($time, $loop);

// new (using default loop)
$promise = timeout($promise, $time);
$promise = resolve($time);
$promise = reject($time);
```

* Improve test suite, use GitHub actions for continuous integration (CI),
update PHPUnit config, run tests on PHP 8 and add full core team to the license.
(#43 by @WyriHaximus, #44 and #45 by @SimonFrings)

## 1.6.0 (2020-07-10)

* Feature: Forward compatibility with react/promise v3.
(#37 by @WyriHaximus)

* Improve test suite and add `.gitattributes` to exclude dev files from exports.
Run tests on PHPUnit 9 and PHP 7.4 and clean up test suite.
(#38 by @WyriHaximus, #39 by @reedy, #41 by @clue and #42 by @SimonFrings)

## 1.5.1 (2019-03-27)

* Fix: Typo in readme
(#35 by @aak74)

* Improvement: Only include functions file when functions aren't defined
(#36 by @Niko9911)

## 1.5.0 (2018-06-13)

* Feature: Improve memory consumption by cleaning up garbage references to pending promise without canceller.
(#34 by @clue)

## 1.4.0 (2018-06-11)

* Feature: Improve memory consumption by cleaning up garbage references.
(#33 by @clue)

## 1.3.0 (2018-04-24)

* Feature: Improve memory consumption by cleaning up unneeded references.
(#32 by @clue)

## 1.2.1 (2017-12-22)

* README improvements
(#28 by @jsor)

* Improve test suite by adding forward compatiblity with PHPUnit 6 and
fix test suite forward compatibility with upcoming EventLoop releases
(#30 and #31 by @clue)

## 1.2.0 (2017-08-08)

* Feature: Only start timers if input Promise is still pending and
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Christian Lück
Copyright (c) 2015 Christian Lück, Cees-Jan Kiewiet, Jan Sorgalla, Chris Boden

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Loading