Skip to content

Commit

Permalink
Support Composer 2 and add 2.0.7
Browse files Browse the repository at this point in the history
Closes #440
  • Loading branch information
dzuelke committed Nov 20, 2020
1 parent 668ae22 commit d9d0f6c
Show file tree
Hide file tree
Showing 9 changed files with 112 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,11 @@

## v184 (2020-11-20)

### ADD

- Support for Composer 2 (#440) [David Zuelke]
- Composer/2.0.7 [David Zuelke]

### CHG

- Install Composer using platform installer [David Zuelke]
Expand Down
5 changes: 5 additions & 0 deletions support/build/composer-2.0.7
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php
# Build Deps: php-min-*

source $(dirname $0)/composer
5 changes: 5 additions & 0 deletions test/fixtures/composer/basic_lock_oldv1/composer.json
@@ -0,0 +1,5 @@
{
"require": {
"php": "7.3.*"
}
}
19 changes: 19 additions & 0 deletions test/fixtures/composer/basic_lock_oldv1/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions test/fixtures/composer/basic_lock_v1/composer.json
@@ -0,0 +1,5 @@
{
"require": {
"php": "7.3.*"
}
}
20 changes: 20 additions & 0 deletions test/fixtures/composer/basic_lock_v1/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions test/fixtures/composer/basic_lock_v2/composer.json
@@ -0,0 +1,5 @@
{
"require": {
"php": "7.3.*"
}
}
20 changes: 20 additions & 0 deletions test/fixtures/composer/basic_lock_v2/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions test/spec/composer_spec.rb
@@ -0,0 +1,28 @@
require_relative "spec_helper"

describe "A PHP application" do
context "with a composer.lock generatead by an old version of Composer" do
it "builds using Composer 1.x" do
new_app_with_stack_and_platrepo('test/fixtures/composer/basic_lock_oldv1').deploy do |app|
expect(app.output).to match(/- composer \(1/)
expect(app.output).to match(/Composer version 1/)
end
end
end
context "with a composer.lock generatead by a late version 1 of Composer" do
it "builds using Composer 1.x" do
new_app_with_stack_and_platrepo('test/fixtures/composer/basic_lock_v1').deploy do |app|
expect(app.output).to match(/- composer \(1/)
expect(app.output).to match(/Composer version 1/)
end
end
end
context "with a composer.lock generatead by version 2 of Composer" do
it "builds using Composer 2.x" do
new_app_with_stack_and_platrepo('test/fixtures/composer/basic_lock_v2').deploy do |app|
expect(app.output).to match(/- composer \(2/)
expect(app.output).to match(/Composer version 2/)
end
end
end
end

0 comments on commit d9d0f6c

Please sign in to comment.