Skip to content

Commit

Permalink
Fix codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
mosbth committed Aug 15, 2018
1 parent a3924e3 commit 54c310a
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 12 deletions.
18 changes: 15 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ build: test doc #theme less-compile less-minify js-minify
.PHONY: install
install: prepare install-tools-php install-tools-bash
@$(call HELPTEXT,$@)
composer install



Expand Down Expand Up @@ -254,7 +255,8 @@ install-tools-php:

curl -Lso $(PHPCBF) https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar && chmod 755 $(PHPCBF)

curl -Lso $(PHPMD) http://static.phpmd.org/php/latest/phpmd.phar && chmod 755 $(PHPMD)
# curl -Lso $(PHPMD) http://static.phpmd.org/php/latest/phpmd.phar && chmod 755 $(PHPMD)
curl -Lso $(PHPMD) http://www.student.bth.se/~mosstud/download/phpmd.phar && chmod 755 $(PHPMD)

curl -Lso $(PHPLOC) https://phar.phpunit.de/phploc.phar && chmod 755 $(PHPLOC)

Expand Down Expand Up @@ -375,7 +377,6 @@ install-tools-bash:
.PHONY: check-tools-bash
check-tools-bash:
@$(call HELPTEXT,$@)
#@$(call CHECK_VERSION, $(SHELLCHECK), | cut -d" " -f3-)
@$(call CHECK_VERSION, $(SHELLCHECK))
@$(call CHECK_VERSION, $(BATS))

Expand Down Expand Up @@ -434,7 +435,18 @@ define GIT_IGNORE_FILES
endef
export GIT_IGNORE_FILES

# target: cimage-update - Install/update Cimage to latest version.
# target: cimage-install - Install Cimage in htdocs
.PHONY: cimage-install
cimage-install:
@$(call HELPTEXT,$@)
install -d htdocs/img htdocs/cimage cache/cimage
chmod 777 cache/cimage
$(ECHO) "$$GIT_IGNORE_FILES" | bash -c 'cat > cache/cimage/.gitignore'
cp vendor/mos/cimage/webroot/img.php htdocs/cimage
cp vendor/mos/cimage/webroot/img/car.png htdocs/img/
touch htdocs/cimage/img_config.php

# target: cimage-update - Update Cimage to latest version.
.PHONY: cimage-update
cimage-update:
@$(call HELPTEXT,$@)
Expand Down
7 changes: 7 additions & 0 deletions REVISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ Revision history



v2.0.0-beta.1 (2018-08-15)
---------------------------------

* Fix codestyle.



v2.0.0-alpha.5 (2018-08-15)
---------------------------------

Expand Down
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"name": "anax/controller",
"type": "library",
"description": "Anax Controller with utility controllers.",
"description": "Anax Controller module, with sample starter controllers.",
"keywords": ["boilerplate", "framework", "mvc", "micro", "education"],
"homepage": "https://dbwebb.se/anax",
"license": "MIT",
"authors": [
{
"name": "Mikael Roos",
"email": "[email protected]",
"homepage": "https://dbwebb.se",
"role": "Developer"
"email": "[email protected]"
}
],
"support": {
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/DevelopmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ public function catchAll(...$args) : object
return $page->render([
"title" => ucfirst($pages[$path]),
"baseTitle" => " | Anax development utilities"
]);
]);
}
}
2 changes: 1 addition & 1 deletion src/Controller/ErrorHandlerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ public function catchAll() : object

return $page->render([
"title" => $pages[$path][0] . $title
], $path);
], $path);
}
}
4 changes: 2 additions & 2 deletions src/Controller/FlatFileContentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FlatFileContentController implements ContainerInjectableInterface
*
* @param array $args as a variadic to catch all arguments.
*
* @return mixed as null when flat file is not found and otherwise a
* @return mixed as null when flat file is not found and otherwise a
* complete response object with content to render.
*/
public function catchAll(...$args)
Expand Down Expand Up @@ -57,6 +57,6 @@ public function catchAll(...$args)
"frontmatter" => $content->frontmatter,
]);

return $page->render($content->frontmatter);
return $page->render($content->frontmatter);
}
}
3 changes: 2 additions & 1 deletion src/Controller/SampleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Anax\Commons\ContainerInjectableInterface;
use Anax\Commons\ContainerInjectableTrait;

// use Anax\Route\Exception\ForbiddenException;
// use Anax\Route\Exception\NotFoundException;
// use Anax\Route\Exception\InternalErrorException;
Expand Down Expand Up @@ -60,7 +61,7 @@ public function indexAction() : string


/**
* Add the request method to the method name to limit what request methods
* Add the request method to the method name to limit what request methods
* the handler supports.
* GET mountpoint/info
*
Expand Down

0 comments on commit 54c310a

Please sign in to comment.