fixing to comply with PSR4 loading standards

Author: Magentron

Makefile

@@ -34,13 +34,16 @@ ENVIRONMENT=
 LANG=nl
 NPM_ASSETS=public/css/app.css public/js/app.js
 NPM_ENV=development
+OS:=$(shell uname -s)
+NPROCS:=$(shell [ Darwin = $(OS) ] && sysctl -n hw.ncpu || nproc)
 PHP=php -d memory_limit=256M $(PHP_EXTRA)
 PHPUNIT=$(PHP) vendor/bin/phpunit -d xdebug.max_nesting_level=250 -d memory_limit=1024M $(PHPUNIT_EXTRA)
 PRETEND=--pretend
 SCOUT_MODELS=
-SRCS= Makefile README.md webpack.mix.js composer.json package-lock.json package.json Envoy.blade.php \
-	  opcache_reset.php server.php phpunit.xml app bootstrap/app.php bootstrap/autoload.php config \
-	  database model resources routes tests
+PHP_SRC=app bootstrap/app.php config database resources routes public/*.php tests
+SRC= Makefile README.md webpack.mix.js composer.json package-lock.json package.json Envoy.blade.php \
+	 opcache_reset.php server.php phpunit.xml app bootstrap/app.php bootstrap/autoload.php config \
+	 database model resources routes tests
 USER_AGENT:=$(shell $(CURL) --version | head -1 | awk '{printf("%s/%s", $$1, $$2);}')
 WGET=wget --no-check-certificate $(WGET_EXTRA)
 WRITABLE_DIRS=storage/*/* bootstrap/cache
@@ -51,6 +54,9 @@ TEMP_DEPLOY_DIR := $(shell echo .deploy.tmp.$$$$)
 
 all:	rw
 
+#
+#	Setup
+#
 rw:
 	sudo chmod -R g+w $(WRITABLE_DIRS)
 	sudo chown -R $(USER):$(WWW_GROUP_ID) $(WRITABLE_DIRS)
@@ -84,6 +90,12 @@ init-elastic:
 	time $(ARTISAN) db:seed --class=DummyDataSeeder
 	[ -z $(SCOUT_MODELS) ] || for model in $(SCOUT_MODELS); do $(ARTISAN) scout:import "$$model"; done
 
+get-envoy:
+	$(WGET) -N https://raw.githubusercontent.com/papertank/envoy-deploy/master/Envoy.blade.php
+
+#
+#	Deployment
+#
 deploy-checkout-copy-manual:
 	@[ ! -z '$(BRANCH)' -a ! -z '$(DST)' ] || (echo "missing BRANCH=... or DST=..." 1>&2; exit 1)
 	(rm -rf $(TEMP_DEPLOY_DIR) && git clone --recursive -j8 -b $(BRANCH) . $(TEMP_DEPLOY_DIR) && rsync -zaSHx $(TEMP_DEPLOY_DIR)/ $(DST)/); rm -rf $(TEMP_DEPLOY_DIR)
@@ -129,6 +141,15 @@ ant build: .build.dummy.
 .build.dummy.:
 	time $(ANT) $(EXTRA) $(ANT_TARGET)
 
+#
+#	Docker
+#
+docker-image:
+	docker build --squash .
+
+#
+#	Testing
+#
 test:	rw clear-cache autodump
 	time $(PHPUNIT) $(EXTRA)
 
@@ -167,6 +188,9 @@ test-elastic testelastic:
 test-migrate:
 	time $(ARTISAN) --env=testing migrate $(EXTRA)
 
+#
+#	NPM
+#
 $(NPM_ASSETS):	Makefile webpack.mix.js resources/assets/sass/*.scss resources/assets/js/*.js
 	time npm run $(NPM_ENV)
 
@@ -184,12 +208,10 @@ npm-watch:
 npm-prod npm-production:
 	@make npm-dev NPM_ENV=production
 
-get-envoy:
-	$(WGET) -N https://raw.githubusercontent.com/papertank/envoy-deploy/master/Envoy.blade.php
-
-docker-image:
-	docker build --squash .
 
+#
+#	Lint
+#
 lint lint-parallel:	
 	@make -j4 jsonlint xmllint phplint bladelint
 
@@ -213,6 +235,42 @@ xmllint xml-lint lint-xml lintxml:
 	@echo lint - XML...
 	@find *.xml app bootstrap public resources routes tests -name '*.xml' | while read file; do nice -20 xmllint --noout "$$file"; done
 
+#
+#	Static code analysis
+#
+loc:
+	@echo making fast copy...
+	@rm -rf build/src
+	@mkdir -p build/src
+	@for i in $(SRC) ; do ln -s ../../"$$i" build/src/; done
+	@echo running sloccount...
+	#sloccount --datadir .sloccount --follow build/src
+	@sloccount --addlang js --addlang makefile --addlang sql --addlangall --follow $(EXTRA) -- build/src/ 2>&1 | fgrep -v 'Warning! Unclosed PHP file'
+	@echo running cloc...
+	@cloc --follow-links build/src
+
+static-analysis static-analyzis static analysis analyzis analyse analyze stat anal:	phpcpd phpcs phploc phpmd phpstan
+
+phpcpd:
+	vendor/bin/phpcpd $(EXTRA) $(PHP_SRC) 
+
+phpcs:
+	vendor/bin/phpcs --standard=PSR2 -p --parallel=$(NPROCS) -s $(EXTRA) $(PHP_SRC) 
+
+phploc:
+	vendor/bin/phploc $(EXTRA) $(PHP_SRC) 
+
+phpmd:
+	for ruleset in cleancode codesize controversial design naming unusedcode; do \
+		vendor/bin/phpmd $(PHP_SRC) ansi $$ruleset $(EXTRA); \
+	done
+
+phpstan:
+	vendor/bin/phpstan analyse $(EXTRA) $(PHP_SRC)
+
+#
+#	Translations
+#
 find-texts:
 	@egrep -Er '>[A-Z][a-z]|^\s*[A-Z][a-z][A-Za-z0-9 _.-]*\s*$$' resources/views/ $(CMD_EXTRA)
 
@@ -224,17 +282,9 @@ gentrans:
 gentrans-en:
 	@make gentrans LANG=en
 
-loc:
-	@echo making fast copy...
-	@rm -rf build/src
-	@mkdir -p build/src
-	@for i in $(SRCS) ; do ln -s ../../"$$i" build/src/; done
-	@echo running sloccount...
-	#sloccount --datadir .sloccount --follow build/src
-	@sloccount --addlang js --addlang makefile --addlang sql --addlangall --follow $(EXTRA) -- build/src/ 2>&1 | fgrep -v 'Warning! Unclosed PHP file'
-	@echo running cloc...
-	@cloc --follow-links build/src
-
+#
+#	Shortcuts
+#
 clean: clear
 	rm -f Envoy[0-9a-f]*.php
 

composer.json

@@ -15,8 +15,7 @@
         }
     ],
     "minimum-stability": "dev",
-    "require": {},
-	"autoload": {
+    "autoload": {
 		"psr-4": {
 			"Magentron\\LaravelScripts\\": "src"
 		},
@@ -30,5 +29,13 @@
 				"Magentron\\LaravelScripts\\Providers\\LaravelScriptsServiceProvider"
 			]
 		}
-	}
+	},
+    "require-dev": {
+        "phpstan/phpstan": "0.12.x-dev",
+        "friendsofphp/php-cs-fixer": "9999999-dev",
+        "phpmd/phpmd": "9999999-dev",
+        "squizlabs/php_codesniffer": "4.0.x-dev",
+        "sebastian/phpcpd": "6.0.x-dev",
+        "phploc/phploc": "7.0.x-dev"
+    }
 }

src/Providers/LaravelScriptsProvider.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ *  laravel-scripts - Laravel service provider
+ *
+ *  @author     Jeroen Derks <jeroen@derks.it>
+ *  @since      2018/Nov/26
+ *  @license    GPLv3 https://www.gnu.org/licenses/gpl.html
+ *  @copyright  Copyright (c) 2018 Jeroen Derks / Derks.IT
+ *  @url        https://github.com/Magentron/laravel-scripts/
+ *
+ *  This file is part of laravel-scripts.
+ *
+ *  laravel-scripts is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or (at
+ *  your option) any later version.
+ *
+ *  laravel-scripts is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with laravel-scripts.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Magentron\LaravelScripts\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class LaravelScriptsServiceProvider
+ *
+ * @package Magentron\LaravelScripts\Providers
+ */
+class LaravelScriptsServiceProvider extends ServiceProvider
+{
+    /**
+     * Files to publish.
+     */
+    const FILES = [
+        'Envoy.blade.php',
+        'Makefile',
+        'opcache_reset.php',
+    ];
+
+
+    /**
+     * Bootstrap the laravel-script provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        foreach (self::FILES as $file) {
+            $this->publishes([
+                realpath(__DIR__ . '/../../' . $file) => base_path($file),
+            ], 'deployment');
+        }
+    }
+}