📝 urls, testing, assets

schmunk42 · schmunk42 · commit 823e598f89ab · 2016-11-03T03:57:11.000+01:00
diff --git a/guide/development/extensions.md b/guide/development/extensions.md
@@ -1,37 +1,40 @@
 Packages (Extensions)
 =====================
 
-It is very easy to extend a phd-based application with existing composer packages. You can integrate any Yii2 
-extension or PHP library into phd 4.
+It is very easy to extend a phd-based application with existing composer packages. You can integrate any Yii2 extension or PHP library into phd.
 
-    docker-compose run --rm php bash
+```
+docker-compose run --rm php bash
+```
 
 Finding packages
 ----------------
 
 Start with a search on [Packagist](https://packagist.org) or from your command line
 
-    $ composer search -N "yii2-excel"
+```
+$ composer search -N "yii2-excel"
+```
 
 Installing packages
 -------------------
 
 To install an extension simply require it in your `composer.json` with the following command
 
-    $ composer require vendor/package
+```
+$ composer require vendor/package
+```
 
+> Make sure to commit your `composer.lock` file, so your co-developers get the exact same version.
 
-
-> Make sure to commit your `composer.lock` file, so your co-developers get the exact same version.     
-  
 Configuring packages
 --------------------
 
-How to configure a package depends on the package and it's type. In general you can follow Yii's rules for application
-module and component configuration.
-  
-  
+How to configure a package depends on the package and it's type. In general you can follow Yii's rules for application module and component configuration.
+
 Show installed packages
 -----------------------
 
-    $ composer show --installed
+```
+$ composer show --installed
+```
diff --git a/guide/development/testing.md b/guide/development/testing.md
@@ -17,7 +17,7 @@ For acceptance or end-to-end tests for example you might want to use a "real" Se
 
 Creating and running a test environment can be a cumbersome task, like executing your tests in an isolated database. 
 
-Therefore the phd 4 Docker images contain pre-installed Codeception binaries for running Yii 2.0 Framework unit-, functional- and acceptance-test-suites.
+Therefore the phd Docker images contain pre-installed Codeception binaries for running Yii 2.0 Framework unit-, functional- and acceptance-test-suites.
 
 ### Configuration
 
@@ -53,6 +53,7 @@ Run codeception directly *(container bash)*
     make bash
     $ codecept run
 
+> :bulb: Basically tests should be independent from each other. But depending on your setup `cli` tests can be used to initialize the test environment for the application. 
 
 ### Advanced usage
     
@@ -82,15 +83,6 @@ $ codecept run functional --coverage --coverage-html
 ```
 
 
-
-### FAQ
-
-#### Functional vs. acceptance tests
-   
-Due to limitations functional-testing should only be used for basic tests, see codeception.com
-   
-For Login, JavaScript, Cookies, Session, ... use acceptance tests. See commands `wait(1)`, `waitForElement(1)`.
-
 #### Grouping tests
 
 tests/codeception
@@ -114,6 +106,18 @@ Further groups
 - @group run-once
 
 
+
+
+### FAQ
+
+#### Functional vs. acceptance tests
+   
+Due to limitations functional-testing should only be used for basic tests, see codeception.com
+   
+For Login, JavaScript, Cookies, Session, ... use acceptance tests. See commands `wait(1)`, `waitForElement(1)`.
+
+> Note: In Codeception acceptance tests checks are performed *as seen* in the browser, for example you have to check for `MYLINK` if there's a `text-transform: uppercase` or a link `mylink`.
+
 #### Detecting application type
 
 Console vs. Web config
@@ -123,7 +127,3 @@ Console vs. Web config
 #### Re-run failed tests
 
 	codecept run -g failed
-
-#### e2e (acceptance)
-
-> Note: In Codeception acceptance tests checks are performed *as seen* in the browser, for example you have to check for `MYLINK` if there's a `text-transform: uppercase` or a link `mylink`.
diff --git a/guide/development/troubleshooting.md b/guide/development/troubleshooting.md
@@ -1,7 +1,7 @@
 Troubleshooting
 ===============
 
-For more frequently asked questions (FAQ) see [GitHub](https://github.com/phundament/app/issues) and [Stackoverflow](http://stackoverflow.com/questions/tagged/phundament)
+For more frequently asked questions (FAQ) see [GitHub](https://github.com/dmstr/docker-phd5-app/issues) and [Stackoverflow](http://stackoverflow.com/questions/tagged/phundament)
 
 Yii
 ---
diff --git a/guide/tutorials/asset-bundles.md b/guide/tutorials/asset-bundles.md
@@ -0,0 +1,25 @@
+Application Asset Bundle
+------------------------
+
+- [[app\assets\AppAsset]]
+
+
+### Asset bundles
+
+By default *phd* runs with the default bootstrap asset bundle from Yii.
+To enable asset customization, edit `src/assets/AppAsset.php` and uncomment `'less/app.less',`.
+
+There are three files included by default:
+
+ - `app.less` main LESS file for application
+ - `bootstrap.less` includes for bootstrap LESS files
+ - `variables.less` bootstrap settings
+ 
+Initial adjustment to the style settings of the application should be made in `variables.less`
+
+> When developing assets you can set `APP_ASSET_FORCE_PUBLISH=1` in your local `.env` file, this improves detection of
+changes for included files.
+> Note: This feature is only available in the `AppAsset` bundle for the application.
+
+For bundling assets for production usage, see tutorial about [asset compression](../6-tutorials/asset-compression.md).
+
diff --git a/guide/tutorials/asset-compression.md b/guide/tutorials/asset-compression.md
@@ -1,42 +1,23 @@
+Assets
+======
+
+
+
+
 Asset compression
 -----------------
 
 phd bundles the assets in the `:development` Docker container, which comes pre-installed with all required
 tools, to make use of Yii 2.0 Framework asset compresssion.
 
+For debugging you can enter a development container
+
     docker-compose run --rm php bash
 
-Bundle the assets from the container-bash
+and bundle the assets from the container-bash
     
     $ mkdir -p web/assets-prod/js web/assets-prod/css       
     $ yii asset src/config/assets-prod.php src/config/bundle-prod.php
     
 > Note! Make sure not to use a backlash `\` at the beginning of your asset-bundle name, since it may conflict with
 > the `className()` which returns values without a starting backslash
-
-
-Application Asset Bundle
-------------------------
-
-- [[app\assets\AppAsset]]
-
-
-### Asset bundles
-
-By default *phd* runs with the default bootstrap asset bundle from Yii.
-To enable asset customization, edit `src/assets/AppAsset.php` and uncomment `'less/app.less',`.
-
-There are three files included by default:
-
- - `app.less` main LESS file for application
- - `bootstrap.less` includes for bootstrap LESS files
- - `variables.less` bootstrap settings
- 
-Initial adjustment to the style settings of the application should be made in `variables.less`
-
-> When developing assets you can set `APP_ASSET_FORCE_PUBLISH=1` in your local `.env` file, this improves detection of
-changes for included files.
-> Note: This feature is only available in the `AppAsset` bundle for the application.
-
-For bundling assets for production usage, see tutorial about [asset compression](../6-tutorials/asset-compression.md).
-
diff --git a/guide/tutorials/docker-webserver.md b/guide/tutorials/docker-webserver.md
@@ -7,7 +7,7 @@ Custom configuration `build/container-files/etc/nginx/conf.d/app.conf`.
 
 ### Customizing startup and webserver configuration
 
-You can build your custom container image on top of the [phd 4 Docker container](https://registry.hub.docker.com/u/phundament/app/) ([repository](https://github.com/phundament/docker)). 
+You can build your custom container image on top of the [phd Docker container](https://registry.hub.docker.com/u/phundament/app/) ([repository](https://github.com/phundament/docker)). 
 Just use the `FROM` instruction in your `Dockerfile`
 
     FROM phundament/app
diff --git a/guide/tutorials/installation-composer.md b/guide/tutorials/installation-composer.md
@@ -16,7 +16,7 @@ Create a new database to store application information.
 
 ### Composer installation
 
-You can install _phd 4_ using [composer](https://getcomposer.org/download/)...
+You can install _phd_ using [composer](https://getcomposer.org/download/)...
 
     composer global require "fxp/composer-asset-plugin:1.1.*"
     composer create-project --stability=beta phundament/app myapp
diff --git a/guide/tutorials/testing-yii2-extensions.md b/guide/tutorials/testing-yii2-extensions.md
@@ -2,13 +2,13 @@
 
 **Note! This is a concept/prototype.**
 
-You can use *[phd 4](https://github.com/phundament/app)* in a docker-stack "wrapped around" the extension directory.
+You can use *[the vanilla application image](https://github.com/dmstr/docker-yii2-app)* in a docker-stack "wrapped around" the extension directory.
 
 The basic concept is to start an application stack with `docker-compose` and "host-mount" the extension directly into `/vendor/name/extension`.
 
 > You should be able to use this approach for any *Yii 2.0 Framework* extension. Note: You need to install the extension in the application. This is a current limitation. 
 
-In `tests/` resides a `docker-compose.yml` file, which contains an full-featured `phundament/app` stack, with pre-installed a *Codeception* test-framework on the `appcli`-container.
+In `tests/` resides a `docker-compose.yml` file, which contains an full-featured `phd` stack, with pre-installed a *Codeception* test-framework on the `appcli`-container.
 There are suites for CLI, unit, function and acceptance testing right - ready to use, right out of the box.
  
 The stack also contains *Selenium* containers for acceptance testing with screenshots - *Firefox* or *Chrome*.
