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: php-enqueue/enqueue-dev
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.2.8
Choose a base ref
...
head repository: php-enqueue/enqueue-dev
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.2.9
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Apr 3, 2017

  1. Copy the full SHA
    71e9955 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    makasim Max Kotliar
    Copy the full SHA
    5a9a341 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    makasim Max Kotliar
    Copy the full SHA
    09c1820 View commit details
  4. Copy the full SHA
    7543a0c View commit details
  5. Merge pull request #38 from php-enqueue/bundle-fix-extension-priority…

    …-ordering
    
    [bundle] Fix extensions priority ordering. Must be from high to low.
    makasim authored Apr 3, 2017
    Copy the full SHA
    04aa5ce View commit details
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -29,16 +29,12 @@ matrix:
cache:
directories:
- $HOME/.composer/cache
- $HOME/php-amqp
- $HOME/rabbitmq-c
- $HOME/bin

install:
- rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini;
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- pkg/amqp-ext/travis/build-php-amqp-ext;
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
- composer update
- composer install --ignore-platform-reqs # ext-amqp is not installed
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker --version; fi
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker-compose --version; fi
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -b; fi
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
"symfony/monolog-bundle": "^2.8|^3",
"symfony/browser-kit": "^2.8|^3",
"symfony/expression-language": "^2.8|^3",
"friendsofphp/php-cs-fixer": "^2"
"friendsofphp/php-cs-fixer": "^2",
"empi89/php-amqp-stubs": "*@dev"
},
"config": {
"bin-dir": "bin"
6 changes: 1 addition & 5 deletions pkg/amqp-ext/.travis.yml
Original file line number Diff line number Diff line change
@@ -12,14 +12,10 @@ php:
cache:
directories:
- $HOME/.composer/cache
- $HOME/php-amqp
- $HOME/rabbitmq-c

install:
- travis/build-php-amqp-ext
- cd $TRAVIS_BUILD_DIR
- composer self-update
- composer install --prefer-source
- composer install --prefer-source --ignore-platform-reqs # ext-amqp is not installed

script:
- vendor/bin/phpunit --exclude-group=functional
1 change: 1 addition & 0 deletions pkg/amqp-ext/composer.json
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
"phpunit/phpunit": "~5.4.0",
"enqueue/test": "^0.2",
"enqueue/enqueue": "^0.2",
"empi89/php-amqp-stubs": "*@dev",
"symfony/dependency-injection": "^2.8|^3",
"symfony/config": "^2.8|^3"
},
18 changes: 0 additions & 18 deletions pkg/amqp-ext/travis/build-php-amqp-ext

This file was deleted.

Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)
}
}

ksort($groupByPriority);
krsort($groupByPriority, SORT_NUMERIC);

$flatExtensions = [];
foreach ($groupByPriority as $extension) {
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ public function testShouldOrderExtensionsByPriority()

$orderedExtensions = $extensions->getArgument(0);

$this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);
$this->assertEquals(new Reference('foo_extension'), $orderedExtensions[0]);
$this->assertEquals(new Reference('baz_extension'), $orderedExtensions[1]);
$this->assertEquals(new Reference('foo_extension'), $orderedExtensions[2]);
$this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);
}

public function testShouldAssumePriorityZeroIfPriorityIsNotSet()
@@ -103,8 +103,8 @@ public function testShouldAssumePriorityZeroIfPriorityIsNotSet()

$orderedExtensions = $extensions->getArgument(0);

$this->assertEquals(new Reference('baz_extension'), $orderedExtensions[0]);
$this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);
$this->assertEquals(new Reference('foo_extension'), $orderedExtensions[1]);
$this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);
$this->assertEquals(new Reference('baz_extension'), $orderedExtensions[2]);
}
}