Skip to content

Commit

Permalink
Implement RFC 0050: Rename Buildpack (#47)
Browse files Browse the repository at this point in the history
* Implement RFC 0050: Rename Buildpack

Renames 'Paketo Composer Install Buildpack' to 'Paketo Buildpack for Composer Install'.

Implements RFC 0050, paketo-buildpacks/rfcs#233, for this buildpack.

Signed-off-by: Daniel Mikusa <[email protected]>

* Fix buildpack name assertions

* fix comment wording

* remove buildpack name assertions

Signed-off-by: Daniel Mikusa <[email protected]>
Co-authored-by: Timothy Hitchener <[email protected]>
Co-authored-by: Tim Hitchener <[email protected]>
Co-authored-by: Sophie Wigmore <[email protected]>
  • Loading branch information
4 people authored Sep 7, 2022
1 parent 5b3c523 commit ea9dbff
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 50 deletions.
2 changes: 1 addition & 1 deletion build.go
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
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
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
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
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
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
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
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

0 comments on commit ea9dbff

Please sign in to comment.