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.

Sign up for GitHub

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

Jump to bottom

Implement RFC 0050: Rename Buildpack #47

Merged
merged 5 commits into from
Sep 7, 2022
Merged

Implement RFC 0050: Rename Buildpack #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb25683
Implement RFC 0050: Rename Buildpack
Aug 31, 2022
3bb550a
Fix buildpack name assertions
thitch97 Sep 2, 2022
6aa2b05
Merge branch 'main' into ghm-pr-a6945465
thitch97 Sep 2, 2022
27f014b
fix comment wording
Sep 6, 2022
c635b40
remove buildpack name assertions
Sep 6, 2022
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 build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ extension = openssl.so`, os.Getenv(PhpExtensionDir))
// https://getcomposer.org/doc/03-cli.md#check-platform-reqs
//
// Any "missing" requirements will be added to an INI file that should be autoloaded via PHP_INI_SCAN_DIR,
// when used in conjunction with the `php-dist` Paketo Cloud Native Buildpack
// when used in conjunction with the `php-dist` Paketo Buildpack
// INI file location: {workingDir}/.php.ini.d/composer-extensions.ini
// PHP_INI_SCAN_DIR: https://github.com/paketo-buildpacks/php-dist/blob/bfed65e9c3b59cf2c5aee3752d82470f8259f655/build.go#L219-L223
// Requires `php-dist` 0.8.0+ (https://github.com/paketo-buildpacks/php-dist/releases/tag/v0.8.0)
Expand Down
2 changes: 1 addition & 1 deletion buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ api = "0.7"
homepage = "https://github.com/paketo-buildpacks/composer-install"
id = "paketo-buildpacks/composer-install"
keywords = ["php", "composer"]
name = "Paketo Composer Install Buildpack"
name = "Paketo Buildpack for Composer Install"
sbom-formats = ["application/vnd.cyclonedx+json", "application/spdx+json", "application/vnd.syft+json"]

[[buildpack.licenses]]
Expand Down
8 changes: 0 additions & 8 deletions integration/custom_vendor_dir_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ func testCustomVendorDir(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainSubstring(fmt.Sprintf("Writing symlink /workspace/custom_vendor_dir => /layers/%s/composer-packages/vendor", strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8765"}).
WithPublish("8765").
Expand Down
8 changes: 0 additions & 8 deletions integration/default_app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ func testDefaultApp(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainSubstring("Ran 'composer install --no-progress --no-dev --no-autoloader'"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8765"}).
WithPublish("8765").
Expand Down
8 changes: 0 additions & 8 deletions integration/global_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,6 @@ func testGlobal(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainSubstring("Ran 'composer global require --no-progress friendsofphp/php-cs-fixer'"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8765"}).
WithPublish("8765").
Expand Down
8 changes: 0 additions & 8 deletions integration/outside_autoloading_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ func testOutsideAutoloading(t *testing.T, context spec.G, it spec.S) {
Expect(logs).To(ContainSubstring("Ran 'composer install --no-progress --no-dev --no-autoloader'"))
Expect(logs).To(ContainSubstring("Ran 'composer dump-autoload --classmap-authoritative'"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8080"}).
WithPublish("8080").
Expand Down
8 changes: 0 additions & 8 deletions integration/with_extensions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ func testWithExtensions(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainSubstring("Ran 'composer check-platform-reqs', found extensions 'fileinfo, gd, mysqli, zip'"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8765"}).
WithPublish("8765").
Expand Down
8 changes: 0 additions & 8 deletions integration/with_vendored_packages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ func testWithVendoredPackages(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainSubstring("Detected existing vendored packages, will run 'composer install' with those packages"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))

container, err = docker.Container.Run.
WithEnv(map[string]string{"PORT": "8765"}).
WithPublish("8765").
Expand Down