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.

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

Getting rid of embedded composer #335

Merged
merged 4 commits into from Mar 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed

- [#332](https://github.com/sculpin/sculpin/pull/332) dropped php 5 support.
- [#335](https://github.com/sculpin/sculpin/pull/335) removed embedded composer
and related commands: install, update, self-update and dump-autoload

### Fixed

Expand Down
12 changes: 1 addition & 11 deletions bin/sculpin.php
Expand Up @@ -39,7 +39,6 @@
unset($memoryInBytes, $memoryLimit);
}

use Dflydev\EmbeddedComposer\Core\EmbeddedComposerBuilder;
use Sculpin\Bundle\SculpinBundle\Console\Application;
use Sculpin\Bundle\SculpinBundle\HttpKernel\KernelFactory;
use Symfony\Component\Console\Input\ArgvInput;
Expand All @@ -61,15 +60,6 @@
chdir($projectDir);
}

$embeddedComposerBuilder = new EmbeddedComposerBuilder($classLoader);

$embeddedComposer = $embeddedComposerBuilder
->setComposerFilename('sculpin.json')
->setVendorDirectory('.sculpin')
->build();

$embeddedComposer->processAdditionalAutoloads();

$kernel = KernelFactory::create($input);
$application = new Application($kernel, $embeddedComposer);
$application = new Application($kernel);
$application->run($input);
2 changes: 0 additions & 2 deletions composer.json
Expand Up @@ -22,7 +22,6 @@
"dflydev/apache-mime-types": "^1.0.1",
"dflydev/canal": "^1.0",
"dflydev/dot-access-configuration": "^1.0.1",
"dflydev/embedded-composer": "^1.0@dev",
"dflydev/symfony-finder-factory": "^1.0",
"doctrine/inflector": "^1.1",
"michelf/php-markdown": "^1.7",
Expand Down Expand Up @@ -76,7 +75,6 @@
}
},
"scripts": {
"post-autoload-dump": "Dflydev\\EmbeddedComposer\\Core\\Script::postAutoloadDump",
"check": [
"@cs-check",
"@phpstan",
Expand Down