Fix build step (#57)

- The build step _should_ work once the above is fixed
- The e2e test requires the generated PHAR
- `Composer` namespaces are whitelisted: not sure if it's a good idea but it's mandatory if we want to get it working for now otherwise things break as soon as you have a dependency which is a composer plugin (e.g. `ocramius/version-package`)

Author: theofidry

Makefile

@@ -1,5 +1,6 @@
 BOX=vendor-bin/box/vendor/bin/box
 PHPUNIT=vendor/bin/phpunit
+PHPSCOPER=bin/php-scoper.phar
 
 .DEFAULT_GOAL := help
 .PHONY: build test tu tc e2e
@@ -14,14 +15,23 @@ help:
 ##---------------------------------------------------------------------------
 
 build:            ## Build the PHAR
-build: bin/php-scoper
+build: vendor
+	rm -f bin/php-scoper.phar
 	rm -rf build
 	rm composer.lock
-	composer install --no-dev --prefer-dist --classmap-authoritative
-	php -d zend.enable_gc=0 bin/php-scoper add-prefix --force
+	#
+	# As of now, files included in `autoload-dev` are not excluded from the
+	# classmap.
+	#
+	# See: https://github.com/composer/composer/issues/6457
+	#
+	# As a result, the the flag `--no-dev` for `composer install` cannot
+	# be used and `box.json.dist` must include the `tests` directory
+	#
+	composer install --prefer-dist --classmap-authoritative
+	php -d zend.enable_gc=0 bin/php-scoper.php add-prefix --force
 	cd build && composer dump-autoload --classmap-authoritative
 	php -d zend.enable_gc=0 $(BOX) build
-	mv build/bin/php-scoper.phar bin/
 	composer install
 
 
@@ -41,8 +51,8 @@ tc: vendor
 	phpdbg -qrr -d zend.enable_gc=0 $(PHPUNIT) --coverage-html=dist/coverage --coverage-text
 
 e2e:			  ## Run end-to-end tests
-e2e: vendor
-	php -d zend.enable_gc=0 bin/php-scoper add-prefix fixtures/set004 -o build/set004 -f
+e2e: scoper
+	php -d zend.enable_gc=0 $(PHPSCOPER) add-prefix fixtures/set004 -o build/set004 -f
 	composer -d=build/set004 dump-autoload
 	php -d zend.enable_gc=0 $(BOX) build -c build/set004/box.json.dist
 	php build/set004/bin/greet.phar > build/output
@@ -74,3 +84,6 @@ vendor: composer.lock
 
 composer.lock: composer.json
 	@echo compose.lock is not up to date.
+
+scoper: build
+

bin/php-scoper renamed to bin/php-scoper.php

@@ -1,9 +1,10 @@
 {
-    "output": "bin/php-scoper.phar",
-    "main": "bin/php-scoper",
     "base-path": "build",
+    "main": "bin/php-scoper.php",
+    "output": "bin/php-scoper.phar",
     "directories": [
-        "src"
+        "src",
+        "tests"
     ],
     "finder": [
         {

box.json.dist

@@ -36,7 +36,7 @@ public function enterNode(Node $node)
         if ($node instanceof UseUse
             && $node->hasAttribute('parent')
             && false === ($node->getAttribute('parent') instanceof GroupUse)
-            && 1 === count($node->name->parts)
+            && (1 === count($node->name->parts) || 'Composer' === $node->name->getFirst())
         ) {
             $node->setAttribute('phpscoper_ignore', true);
         }

src/NodeVisitor/IgnoreNamespaceScoperNodeVisitor.php

@@ -512,6 +512,23 @@ public function provideValidFiles()
 use Humbug\Bar\FooNamespace;
 use Humbug\Bar\FooNamespace;
 
+PHP
+        ];
+
+        yield '[Use statement for a class] composer use statement' => [
+            <<<'PHP'
+<?php
+
+use Composer\Unknown;
+
+PHP
+            ,
+            'Humbug',
+            <<<'PHP'
+<?php
+
+use Composer\Unknown;
+
 PHP
         ];