From 60d74b0b447185e2f0948702650c9fc90d651d67 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 19 Jul 2016 17:05:02 +0600 Subject: [PATCH] Fixed naming (PHPCI -> PHP Censor) --- LICENSE.md | 5 +- README.md | 37 +++--- composer.json | 146 +++++++++++----------- docs/en/README.md | 16 +-- docs/en/config.md | 9 +- docs/en/configuring.md | 8 +- docs/en/installing.md | 40 +++--- docs/en/interpolation.md | 2 +- docs/en/logging.md | 4 +- docs/en/plugins/atoum.md | 2 +- docs/en/plugins/behat.md | 2 +- docs/en/plugins/composer.md | 2 +- docs/en/plugins/deployer.md | 4 +- docs/en/plugins/email.md | 2 +- docs/en/plugins/env.md | 2 +- docs/en/plugins/grunt.md | 2 +- docs/en/plugins/php_parallel_lint.md | 2 +- docs/en/plugins/php_unit.md | 6 +- docs/en/plugins/shell.md | 13 -- docs/en/plugins/slack_notify.md | 14 +-- docs/en/sources/bitbucket.md | 2 +- docs/en/sources/github.md | 6 +- docs/en/sources/gitlab.md | 6 +- docs/en/status.md | 18 +-- docs/en/updating.md | 12 +- docs/en/virtual_host.md | 4 +- docs/en/workers/cron.md | 8 +- docs/en/workers/daemon.md | 6 +- docs/en/workers/worker.md | 28 ++--- phpcs.xml | 14 +-- phpmd.xml | 4 +- phpunit.xml | 16 +-- public/assets/css/AdminLTE-custom.css | 2 +- public/assets/img/logo-icon.png | Bin 4687 -> 0 bytes public/assets/img/logo-icon.svg | 1 - public/assets/img/logo-large.png | Bin 2851 -> 0 bytes public/assets/img/logo.png | Bin 1116 -> 0 bytes public/assets/img/php-censor-logo.png | Bin 0 -> 1417 bytes src/PHPCI/Application.php | 2 +- src/PHPCI/Command/RebuildQueueCommand.php | 2 +- src/PHPCI/Command/RunCommand.php | 2 +- src/PHPCI/Command/WorkerCommand.php | 4 +- src/PHPCI/Helper/Email.php | 4 +- src/PHPCI/Languages/lang.da.php | 52 ++++---- src/PHPCI/Languages/lang.de.php | 52 ++++---- src/PHPCI/Languages/lang.el.php | 52 ++++---- src/PHPCI/Languages/lang.en.php | 54 ++++---- src/PHPCI/Languages/lang.es.php | 52 ++++---- src/PHPCI/Languages/lang.fr.php | 52 ++++---- src/PHPCI/Languages/lang.it.php | 52 ++++---- src/PHPCI/Languages/lang.nl.php | 50 ++++---- src/PHPCI/Languages/lang.pl.php | 52 ++++---- src/PHPCI/Languages/lang.ru.php | 52 ++++---- src/PHPCI/Languages/lang.uk.php | 52 ++++---- src/PHPCI/Model/Build/GithubBuild.php | 10 +- src/PHPCI/Plugin/Campfire.php | 4 +- src/PHPCI/Plugin/Deployer.php | 4 +- src/PHPCI/Plugin/Email.php | 2 +- src/PHPCI/Plugin/FlowdockNotify.php | 2 +- src/PHPCI/Plugin/HipchatNotify.php | 8 +- src/PHPCI/Plugin/SlackNotify.php | 4 +- src/PHPCI/View/BuildStatus/view.phtml | 2 +- src/PHPCI/View/Session.phtml | 52 +------- src/PHPCI/View/layout.phtml | 2 +- 64 files changed, 536 insertions(+), 585 deletions(-) delete mode 100644 public/assets/img/logo-icon.png delete mode 100644 public/assets/img/logo-icon.svg delete mode 100644 public/assets/img/logo-large.png delete mode 100644 public/assets/img/logo.png create mode 100755 public/assets/img/php-censor-logo.png diff --git a/LICENSE.md b/LICENSE.md index 4c4f6952..4db5eba9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,7 @@ -Copyright (c) 2013-2014, Block 8 Limited +PHP Censor Copyright (c) 2016, Corpsee +All rights reserved. + +PHPCI Copyright (c) 2013, Block 8 Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 0b304a8c..7945ada8 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,34 @@ -PHPCI -===== +PHP Censor +---------- -PHPCI is a free and open source (BSD License) continuous integration tool specifically designed for PHP. We've built it with simplicity in mind, so whilst it doesn't do *everything* Jenkins can do, it is a breeze to set up and use. +PHP Censor is a fork of PHPCI (And B8Framework). PHP Censor is a free and open source (BSD-2-Clause license) continuous +integration tool specifically designed for PHP. We've built it with simplicity in mind, so whilst it doesn't +do *everything* Jenkins can do, it is a breeze to set up and use. -**Current Build Status** +What it does +============ -[![Build Status](http://phpci.block8.net/build-status/image/2?branch=master)](http://phpci.block8.net/build-status/view/2?branch=master) - -**Chat Room** - -We have a chat room for discussing PHPCI, you can access it here: [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Block8/PHPCI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge) - -##What it does: * Clones your project from Github, Bitbucket or a local path * Allows you to set up and tear down test databases. * Installs your project's Composer dependencies. -* Runs through any combination of the [supported plugins](https://www.phptesting.org/wiki#plugins). +* Runs through any combination of the [supported plugins](docs/README.md)). * You can mark directories for the plugins to ignore. * You can mark certain plugins as being allowed to fail (but still run.) -### What it doesn't do (yet): +What it doesn't do (yet) +======================== + * Virtualised testing. * Multiple PHP-version tests. * Install PEAR or PECL extensions. * Deployments - We strongly recommend using [Deployer](http://phpdeployment.org) -## Getting Started: -We've got documentation on our website on [installing PHPCI](https://www.phptesting.org/install-phpci) and [adding support for PHPCI to your projects](https://www.phptesting.org/wiki/Adding-PHPCI-Support-to-Your-Projects). +Documentation +============= -## Contributing -Contributions from others would be very much appreciated! Please read our [guide to contributing](https://github.com/Block8/PHPCI/blob/master/.github/CONTRIBUTING.md) for more information on how to get involved. +[PHP Censor documentation](docs/README.md) -## Questions? -Your best place to go is the [mailing list](https://groups.google.com/forum/#!forum/php-ci). If you're already a member of the mailing list, you can simply email php-ci@googlegroups.com. +License +======= + +The PHP Censor is open source software licensed under the BSD-2-Clause license. diff --git a/composer.json b/composer.json index f6a4ec0c..e27fd0bc 100644 --- a/composer.json +++ b/composer.json @@ -1,74 +1,80 @@ { - "name": "block8/phpci", - "description": "Simple continuous integration for PHP projects.", - "minimum-stability": "stable", - "type": "library", - "keywords": ["php", "phpci", "ci", "continuous", "integration", "testing", "phpunit", "continuous integration", "jenkins", "travis"], - "homepage": "http://www.phptesting.org/", - "license": "BSD-2-Clause", - "authors": [ - { - "name": "Dan Cryer", - "email": "dan.cryer@block8.co.uk", - "homepage": "http://www.block8.co.uk", - "role": "Developer" - } - ], - "support": { - "email": "hello+phpci@block8.co.uk", - "issues": "https://github.com/Block8/PHPCI/issues", - "source": "https://github.com/Block8/PHPCI" + "name": "corpsee/php-censor", + "description": "Simple continuous integration for PHP projects. PHPCI fork.", + "minimum-stability": "stable", + "type": "library", + "keywords": ["php", "php-censor", "ci", "continuous integration"], + "homepage": "https://github.com/corpsee/php-censor", + "license": "BSD-2-Clause", + "authors": [ + { + "name": "Corpsee", + "email": "poisoncorpsee@gmail.com", + "homepage": "http://corpsee.com", + "role": "PHP Censor developer" }, - "autoload": { - "psr-4": { - "PHPCI\\": "src/PHPCI/", - "b8\\": "src/B8Framework/" - } - }, - "autoload-dev": { - "psr-4": { - "Tests\\PHPCI\\": "tests/PHPCI/", - "Tests\\b8\\": "tests/B8Framework/" - } - }, - "require": { - "php": ">=5.4.0", - "ext-pdo": "*", - "ext-pdo_mysql": "*", - "ircmaxell/password-compat": "1.0.*", - "swiftmailer/swiftmailer": "5.4.*", - "symfony/yaml": "2.8.*", - "symfony/console": "2.8.*", - "psr/log": "1.0.*", - "monolog/monolog": "1.17.*", - "pimple/pimple": "3.0.*", - "robmorgan/phinx": "0.5.*", - "sensiolabs/ansi-to-html": "1.1.*", - "pda/pheanstalk": "3.1.*" - }, - "require-dev": { - "phpunit/phpunit": "4.8.*", - "phpmd/phpmd": "2.4.*", - "sebastian/phpcpd": "2.0.*", - "squizlabs/php_codesniffer": "2.6.*", - "block8/php-docblock-checker": "1.0.*", - "phploc/phploc": "3.0.*", - "jakub-onderka/php-parallel-lint": "0.9.*" - }, - "suggest": { - "block8/php-docblock-checker": "PHP Docblock Checker", - "phpmd/phpmd": "PHP Mess Detector", - "sebastian/phpcpd": "PHP Copy/Paste Detector", - "squizlabs/php_codesniffer": "PHP Code Sniffer", - "phpspec/phpspec": "PHP Spec", - "fabpot/php-cs-fixer": "PHP Coding Standards Fixer", - "phploc/phploc": "PHP Lines of Code", - "atoum/atoum": "Atoum", - "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", - "behat/behat": "Behat BDD Testing", - "phptal/phptal": "PHPTAL templating engine", - "maknz/slack": "Slack", - "hipchat/hipchat-php": "Hipchat", - "mremi/flowdock": "Flowdock" + { + "name": "Dan Cryer", + "email": "dan.cryer@block8.co.uk", + "homepage": "http://www.block8.co.uk", + "role": "PHPCI developer" } + ], + "support": { + "issues": "https://github.com/corpsee/php-censor/issues", + "source": "https://github.com/corpsee/php-censor" + }, + "autoload": { + "psr-4": { + "PHPCI\\": "src/PHPCI/", + "b8\\": "src/B8Framework/" + } + }, + "autoload-dev": { + "psr-4": { + "Tests\\PHPCI\\": "tests/PHPCI/", + "Tests\\b8\\": "tests/B8Framework/" + } + }, + "require": { + "php": ">=5.4.0", + "ext-pdo": "*", + "ext-pdo_mysql": "*", + + "ircmaxell/password-compat": "1.0.*", + "swiftmailer/swiftmailer": "5.4.*", + "symfony/yaml": "2.8.*", + "symfony/console": "2.8.*", + "psr/log": "1.0.*", + "monolog/monolog": "1.17.*", + "pimple/pimple": "3.0.*", + "robmorgan/phinx": "0.5.*", + "sensiolabs/ansi-to-html": "1.1.*", + "pda/pheanstalk": "3.1.*" + }, + "require-dev": { + "phpunit/phpunit": "4.8.*", + "phpmd/phpmd": "2.4.*", + "sebastian/phpcpd": "2.0.*", + "squizlabs/php_codesniffer": "2.6.*", + "block8/php-docblock-checker": "1.0.*", + "phploc/phploc": "3.0.*", + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "suggest": { + "block8/php-docblock-checker": "PHP Docblock Checker", + "phpmd/phpmd": "PHP Mess Detector", + "sebastian/phpcpd": "PHP Copy/Paste Detector", + "squizlabs/php_codesniffer": "PHP Code Sniffer", + "phpspec/phpspec": "PHP Spec", + "fabpot/php-cs-fixer": "PHP Coding Standards Fixer", + "phploc/phploc": "PHP Lines of Code", + "atoum/atoum": "Atoum", + "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", + "behat/behat": "Behat BDD Testing", + "phptal/phptal": "PHPTAL templating engine", + "maknz/slack": "Slack", + "hipchat/hipchat-php": "Hipchat", + "mremi/flowdock": "Flowdock" + } } diff --git a/docs/en/README.md b/docs/en/README.md index e53c3865..ab6cd0e2 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -1,21 +1,21 @@ -PHPCI documentation -------------------- +PHP Censor documentation +------------------------ Getting Started =============== -* [Installing PHPCI](installing.md) +* [Installing PHP Censor](installing.md) * [Adding a Virtual Host](virtual_host.md) * [Run Builds Using a Worker](workers/worker.md) * [Run Builds Using a Daemon](workers/daemon.md) * [Run Builds Using Cron](workers/cron.md) -* [Adding PHPCI Support to Your Projects](config.md) +* [Adding PHP Censor Support to Your Projects](config.md) * [Setting up Logging](logging.md) -* [Updating PHPCI](updating.md) -* [Configuring PHPCI](configuring.md) +* [Updating PHP Censor](updating.md) +* [Configuring PHP Censor](configuring.md) -Using PHPCI -=========== +Using PHP Censor +================ * Automatically building commits pushed to * [Github](sources/github.md) diff --git a/docs/en/config.md b/docs/en/config.md index f35c613d..d0b169a2 100644 --- a/docs/en/config.md +++ b/docs/en/config.md @@ -1,7 +1,8 @@ -Adding PHPCI Support to Your Projects -------------------------------------- +Adding PHP Censor Support to Your Projects +------------------------------------------ -Similar to Travis CI, to support PHPCI in your project, you simply need to add a `phpci.yml` file to the root of your repository. The file should look something like this: +Similar to Travis CI, to support PHP Censor in your project, you simply need to add a `phpci.yml` file to the root of +your repository. The file should look something like this: ```yml build_settings: @@ -48,7 +49,7 @@ complete: - "DROP DATABASE IF EXISTS test;" ``` -As mentioned earlier, PHPCI is powered by plugins, there are several phases in which plugins can be run: +As mentioned earlier, PHP Censor is powered by plugins, there are several phases in which plugins can be run: * `setup` - This phase is designed to initialise the build procedure. * `test` - The tests that should be run during the build. Plugins run during this phase will contribute to the success or failure of the build. diff --git a/docs/en/configuring.md b/docs/en/configuring.md index 826db858..ead4b194 100644 --- a/docs/en/configuring.md +++ b/docs/en/configuring.md @@ -1,9 +1,9 @@ -Configuring PHPCI ------------------ +Configuring PHP Censor +---------------------- -The PHPCI configuration on the server is automatically generated into the `phpci/PHPCI/config.yml` file during installation. One might need to also edit the file manually. +The PHP Censor configuration on the server is automatically generated into the `config.yml` file during installation. One might need to also edit the file manually. -For example, to [disable authentication](https://www.phptesting.org/news/phpci-1-5-released), one could log into phpci and go into the settings to disable it. But if you have already set up a username/password pair and have forgotten the password, and if the server is on a local network, and it's not sending the `forgot password` email, then editing the config file manually would be handy. To do so, just edit the `phpci` section in the config file (which is in [yaml format](https://en.wikipedia.org/wiki/YAML)), and add +For example, one could log into phpci and go into the settings to disable it. But if you have already set up a username/password pair and have forgotten the password, and if the server is on a local network, and it's not sending the `forgot password` email, then editing the config file manually would be handy. To do so, just edit the `phpci` section in the config file (which is in [yaml format](https://en.wikipedia.org/wiki/YAML)), and add phpci: authentication_settings: diff --git a/docs/en/installing.md b/docs/en/installing.md index 602b91f3..515c6a0f 100644 --- a/docs/en/installing.md +++ b/docs/en/installing.md @@ -1,5 +1,5 @@ -Installing PHPCI ----------------- +Installing PHP Censor +--------------------- What you'll need ================ @@ -12,24 +12,24 @@ What you'll need * The following functions need to be enabled: `exec()`, `shell_exec()` and `proc_open()` in php.ini. * PHP must have OpenSSL support enabled. -Installing PHPCI from Composer +Installing PHP Censor from Composer +=================================== + +* Go to the directory in which you want to install PHP Censor, for example: `/var/www` +* Download Composer if you haven't already: `curl -sS https://getcomposer.org/installer | php` +* Download PHP Censor: `./composer.phar create-project corpsee/php-censor php-censor --keep-vcs --no-dev` +* Go to the newly created PHP Censor directory, and install Composer dependencies: `cd php-censor && ../composer.phar install` +* Run the PHP Censor installer: `./console phpci:install` +* [Add a virtual host to your web server](virtual_host.md), pointing to the `public` directory within your new PHP Censor directory. You'll need to set up rewrite rules to point all non-existent requests to PHP Censor. +* [Set up the PHP Censor Worker](workers/worker.md), or you can run builds using the [daemon](workers/daemon.md) or [a cron-job](workers/cron.md) to run PHP Censor builds. + +Installing PHP Censor Manually ============================== -* Go to the directory in which you want to install PHPCI, for example: `/var/www` -* Download Composer if you haven't already: `curl -sS https://getcomposer.org/installer | php` -* Download PHPCI: `./composer.phar create-project block8/phpci phpci --keep-vcs --no-dev` -* Go to the newly created PHPCI directory, and install Composer dependencies: `cd phpci && ../composer.phar install` -* Run the PHPCI installer: `./console phpci:install` -* [Add a virtual host to your web server](virtual_host.md), pointing to the `public` directory within your new PHPCI directory. You'll need to set up rewrite rules to point all non-existent requests to PHPCI. -* [Set up the PHPCI Worker](workers/worker.md), or you can run builds using the [PHPCI daemon](workers/daemon.md) or [a cron-job](workers/cron.md) to run PHPCI builds. - -Installing PHPCI Manually -========================= - -* Go to the directory in which you want to install PHPCI, for example: `/var/www` -* [Download PHPCI](https://github.com/Block8/PHPCI/releases/latest) and unzip it. -* Go to the PHPCI directory: `cd /var/www/phpci` +* Go to the directory in which you want to install PHP Censor, for example: `/var/www` +* [Download PHP Censor](https://github.com/corpsee/php-censor/releases/latest) and unzip it. +* Go to the PHP Censor directory: `cd /var/www/php-censor` * Install dependencies using Composer: `composer install` -* Install PHPCI itself: `php ./console phpci:install` -* [Add a virtual host to your web server](virtual_host.md), pointing to the `public` directory within your new PHPCI directory. You'll need to set up rewrite rules to point all non-existent requests to PHPCI. -* [Set up the PHPCI Worker](workers/worker.md), or you can run builds using the [PHPCI daemon](workers/daemon.md) or [a cron-job](workers/cron.md) to run PHPCI builds. +* Install PHP Censor itself: `php ./console phpci:install` +* [Add a virtual host to your web server](virtual_host.md), pointing to the `public` directory within your new PHP Censor directory. You'll need to set up rewrite rules to point all non-existent requests to PHP Censor. +* [Set up the PHP Censor Worker](workers/worker.md), or you can run builds using the [daemon](workers/daemon.md) or [a cron-job](workers/cron.md) to run PHP Censor builds. diff --git a/docs/en/interpolation.md b/docs/en/interpolation.md index 2c29b72d..db604abd 100644 --- a/docs/en/interpolation.md +++ b/docs/en/interpolation.md @@ -18,4 +18,4 @@ Where something can be one of the following: * **BUILD** - The build number * **PROJECT_TITLE** - The name of the project * **BUILD_PATH** - The path to the build -* **BUILD_URI** - The URL to the build in PHPCI +* **BUILD_URI** - The URL to the build in PHP Censor diff --git a/docs/en/logging.md b/docs/en/logging.md index 456f6654..08e9a315 100644 --- a/docs/en/logging.md +++ b/docs/en/logging.md @@ -6,8 +6,8 @@ Basics The phpci codebase makes use of the [psr3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md) logging standard. By default we use [Monolog](https://github.com/Seldaek/monolog) to handle the actual work implementing this standard. -How to Setup Logging (For people running a PHPCI instance) -========================================================== +How to Setup Logging (For people running a PHP Censor instance) +=============================================================== The only step required to activate logging is to create a file in the root directory called loggerconfig.php with content like the following: diff --git a/docs/en/plugins/atoum.md b/docs/en/plugins/atoum.md index a2617f46..e9e7b413 100644 --- a/docs/en/plugins/atoum.md +++ b/docs/en/plugins/atoum.md @@ -11,7 +11,7 @@ Configuration - **args** [string, optional] - Allows you to pass command line arguments to Atoum. - **config** [string, optional] - Path to an Atoum configuration file. - **directory** [string, optional] - Path in which to run Atom (defaults to the build root). -- **executable** [string, optional] - Allows you to provide a path to the Atom binary (defaults to PHPCI root, vendor/bin, or a system-provided Atom binary). +- **executable** [string, optional] - Allows you to provide a path to the Atom binary (defaults to PHP Censor root, vendor/bin, or a system-provided Atom binary). ### Examples ```yml diff --git a/docs/en/plugins/behat.md b/docs/en/plugins/behat.md index 16b8b8f1..87cede9a 100644 --- a/docs/en/plugins/behat.md +++ b/docs/en/plugins/behat.md @@ -8,7 +8,7 @@ Configuration ### Options -- **executable** [string, optional] - Allows you to provide a path to the Behat binary (defaults to PHPCI root, vendor/bin, or a system-provided Behat binary). +- **executable** [string, optional] - Allows you to provide a path to the Behat binary (defaults to PHP Censor root, vendor/bin, or a system-provided Behat binary). - **features** [string, optional] - Provide a list of Behat features to run. ### Examples diff --git a/docs/en/plugins/composer.md b/docs/en/plugins/composer.md index 2da4037f..dd0b8c3b 100644 --- a/docs/en/plugins/composer.md +++ b/docs/en/plugins/composer.md @@ -28,7 +28,7 @@ setup: Warning ======= -If you are using a Composer private repository like Satis, with HTTP authentication, you must check your username and password inside the ```auth.json``` file. PHPCI uses the ```--no-interaction``` flag, so it will not warn if you must provide that info. +If you are using a Composer private repository like Satis, with HTTP authentication, you must check your username and password inside the ```auth.json``` file. PHP Censor uses the ```--no-interaction``` flag, so it will not warn if you must provide that info. For more info, please check the Composer documentation. diff --git a/docs/en/plugins/deployer.md b/docs/en/plugins/deployer.md index 2cc3867e..a157e381 100644 --- a/docs/en/plugins/deployer.md +++ b/docs/en/plugins/deployer.md @@ -9,7 +9,7 @@ Configuration ### Options * **webhook_url** [required, string] - The URL to your Deployer WebHook -* **reason** [optional, string] - Your deployment message. Default - PHPCI Build #%BUILD% - %COMMIT_MESSAGE% +* **reason** [optional, string] - Your deployment message. Default - PHP Censor Build #%BUILD% - %COMMIT_MESSAGE% * **update_only** [optional, bool, true|false] - Whether the deployment should only be run if the currently deployed branches matches the one being built. Default - true ### Examples @@ -18,6 +18,6 @@ Configuration success: deployer: webhook_url: "https://deployer.example.com/deploy/QZaF1bMIUqbMFTmKDmgytUuykRN0cjCgW9SooTnwkIGETAYhDTTYoR8C431t" - reason: "PHPCI Build #%BUILD% - %COMMIT_MESSAGE%" + reason: "PHP Censor Build #%BUILD% - %COMMIT_MESSAGE%" update_only: true ``` diff --git a/docs/en/plugins/email.md b/docs/en/plugins/email.md index e5f49f66..52130e21 100644 --- a/docs/en/plugins/email.md +++ b/docs/en/plugins/email.md @@ -19,7 +19,7 @@ Configuration ### Examples -See [Adding PHPCI Support to Your Projects](https://www.phptesting.org/wiki/Adding-PHPCI-Support-to-Your-Projects) for more information about how to configure plugins. +See [Adding PHP Censor Support to Your Projects](../config.md) for more information about how to configure plugins. Send an email to the committer as well as one@exameple.com if a build fails: ```yml diff --git a/docs/en/plugins/env.md b/docs/en/plugins/env.md index 05c80e1b..fc2e806a 100644 --- a/docs/en/plugins/env.md +++ b/docs/en/plugins/env.md @@ -1,7 +1,7 @@ Plugin Env ---------- -Sets environment variables on the PHPCI server for the build. +Sets environment variables on the PHP Censor server for the build. Configuration ============= diff --git a/docs/en/plugins/grunt.md b/docs/en/plugins/grunt.md index 512eedc7..fb104ff2 100644 --- a/docs/en/plugins/grunt.md +++ b/docs/en/plugins/grunt.md @@ -9,7 +9,7 @@ Configuration ### Options - **directory** [string, optional] - The directory in which to run Grunt (defaults to build root.) -- **grunt** [string, optional] - Allows you to provide a path to Grunt (defaults to PHPCI root, vendor/bin, or a system-provided Grunt). +- **grunt** [string, optional] - Allows you to provide a path to Grunt (defaults to PHP Censor root, vendor/bin, or a system-provided Grunt). - **gruntfile** [string, optional] - Gruntfile to run (defaults to `Gruntfile.js`). - **task** [string, optional] - The Grunt task to run. diff --git a/docs/en/plugins/php_parallel_lint.md b/docs/en/plugins/php_parallel_lint.md index f264fabc..2ec6cf6f 100644 --- a/docs/en/plugins/php_parallel_lint.md +++ b/docs/en/plugins/php_parallel_lint.md @@ -1,7 +1,7 @@ Plugin PHP Parallel Lint ------------------------ -Similar to the [standard PHP Lint plugin](https://github.com/Block8/PHPCI/wiki/Lint-plugin), except that it uses the [PHP Parallel Lint](https://github.com/JakubOnderka/PHP-Parallel-Lint) project to run. +Similar to the [standard PHP Lint plugin](lint.md), except that it uses the [PHP Parallel Lint](https://github.com/JakubOnderka/PHP-Parallel-Lint) project to run. Configuration ============= diff --git a/docs/en/plugins/php_unit.md b/docs/en/plugins/php_unit.md index 8a3fc50e..dc95e9e3 100644 --- a/docs/en/plugins/php_unit.md +++ b/docs/en/plugins/php_unit.md @@ -39,8 +39,8 @@ test: Troubleshooting =============== -If standard logging of PHPCI is not enough, to get standard output from any command, including PHPUnit, edit `BaseCommandExecutor::executeCommand()` to see what exactly is wrong -* Run `composer update` in phpunit plugin directory of PHPCI to get all of its dependencies -* If phpunit is inside of the project's composer.json, it might interfere with PHPCI's phpunit installation +If standard logging of PHP Censor is not enough, to get standard output from any command, including PHPUnit, edit `BaseCommandExecutor::executeCommand()` to see what exactly is wrong +* Run `composer update` in phpunit plugin directory of PHP Censor to get all of its dependencies +* If phpunit is inside of the project's composer.json, it might interfere with PHP Censor's phpunit installation * Make sure you have XDebug installed.`The Xdebug extension is not loaded. No code coverage will be generated.` Otherwise test report parsing in `TapParser` will fail, wanting coverage report as well `Invalid TAP string, number of tests does not match specified test count.` diff --git a/docs/en/plugins/shell.md b/docs/en/plugins/shell.md index ad1319ad..44d4e365 100644 --- a/docs/en/plugins/shell.md +++ b/docs/en/plugins/shell.md @@ -3,19 +3,6 @@ Plugin Shell Runs a given Shell command. -**Note: ** Because this plugin could potentially be abused, it requires extra steps to enable it: - -1. In the root of your PHPCI system, in the same directory where you'll find composer.json and vars.php, look for a file local_vars.php. If it does not exist, create it. -2. In local_vars.php add this code: - -```php - - <%BUILD_URI%|Build #%BUILD%> has finished for commit <%COMMIT_URI%|%SHORT_COMMIT% (%COMMIT_EMAIL%)> on branch <%BRANCH_URI%|%BRANCH%>` | | `show_status` | No | Whether or not to append the build status as an attachment in slack. Default - true @@ -24,8 +24,8 @@ Send a message if the build fails: failure: slack_notify: webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" - room: "#phpci" - username: "PHPCI" + room: "#php-censor" + username: "PHP Censor" icon: ":ghost:" message: "%PROJECT_TITLE% - build %BUILD% failed! :angry:" show_status: false @@ -37,8 +37,8 @@ Send a message if the build is successful: success: slack_notify: webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" - room: "#phpci" - username: "PHPCI" + room: "#php-censor" + username: "PHP Censor" icon: ":ghost:" message: "%PROJECT_TITLE% - build %BUILD% succeeded! :smiley:" show_status: false @@ -50,8 +50,8 @@ Send a message every time the build runs: complete: slack_notify: webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" - room: "#phpci" - username: "PHPCI" + room: "#php-censor" + username: "PHP Censor" icon: ":ghost:" message: "%PROJECT_TITLE% - build %BUILD% completed" show_status: true diff --git a/docs/en/sources/bitbucket.md b/docs/en/sources/bitbucket.md index 6b5d4626..f81f0e8c 100644 --- a/docs/en/sources/bitbucket.md +++ b/docs/en/sources/bitbucket.md @@ -3,7 +3,7 @@ Automatically building commits pushed to Bitbucket If you would like your builds to run automatically whenever there is a commit or other similar activity in your Bitbucket repository, perform the following steps: -1. Log into PHPCI. +1. Log into PHP Censor. 2. Click on your Bitbucket project. 3. Copy the web hook link specified on the left. 4. Log into Bitbucket and go to your repo. diff --git a/docs/en/sources/github.md b/docs/en/sources/github.md index 28e10ce0..adcf7dde 100644 --- a/docs/en/sources/github.md +++ b/docs/en/sources/github.md @@ -3,12 +3,12 @@ Automatically building commits pushed to GitHub If you would like your builds to run automatically whenever there is a commit or other similar activity in your GitHub repository, perform the following steps: -1. Log into PHPCI. +1. Log into PHP Censor. 2. Click on your GitHub project. 3. Copy the web hook link specified on the right of the page. 4. Log into GitHub and go to your repository. 5. Click the settings icon on the lower right sidebar. 6. Click on "Webhooks & Services". 7. Add your web hook link you copied above, and specify when you would like it to run. -8. Add the public key for the project in PHPCI to the deploy keys for the repository on GitHub. -9. Verify that the initial test delivery was successful. If not, make sure that your PHPCI machine is reachable from the internet. +8. Add the public key for the project in PHP Censor to the deploy keys for the repository on GitHub. +9. Verify that the initial test delivery was successful. If not, make sure that your PHP Censor machine is reachable from the internet. diff --git a/docs/en/sources/gitlab.md b/docs/en/sources/gitlab.md index d7d74b08..70c6986b 100644 --- a/docs/en/sources/gitlab.md +++ b/docs/en/sources/gitlab.md @@ -3,12 +3,12 @@ Automatically building commits pushed to GitLab If you would like your builds to run automatically whenever there is a commit or other similar activity in your GitLab repository, perform the following steps: -1. Log into PHPCI. +1. Log into PHP Censor. 2. Click on your Gitlab project. 3. Copy the web hook link specified on the left. 4. Log into Gitlab and go to your repo. 5. Click the "settings" tab in the top right corner of the page. 6. Click on "Web Hooks". -7. Paste the link you copied from PHPCI into the "URL" textbox. -8. Select the events which you want to trigger a PHPCI build. The default and recommended setup is to only enable "push events." +7. Paste the link you copied from PHP Censor into the "URL" textbox. +8. Select the events which you want to trigger a PHP Censor build. The default and recommended setup is to only enable "push events." 9. Click "Add Web Hook," and verify that the test was successful. diff --git a/docs/en/status.md b/docs/en/status.md index fa7491b9..1408a195 100644 --- a/docs/en/status.md +++ b/docs/en/status.md @@ -4,31 +4,31 @@ Project Status Images and Status Page Status Image ============ -Most Continuous Integration systems provide a simple image URL that you can use to display your project status on other web sites (like Github) - PHPCI is no different. +Most Continuous Integration systems provide a simple image URL that you can use to display your project status on other web sites (like Github) - PHP Censor is no different. -You can find the status image at the following location: `http://{PHPCI URL}/build-status/image/{PROJECT ID}` +You can find the status image at the following location: `http://{PHP_CENSOR_URL}/build-status/image/{PROJECT ID}` -So for example, our instance of PHPCI is at `phpci.block8.net`, and our PHPCI project ID is `2`, so the image URL is: `http://phpci.block8.net/build-status/image/2`. +So for example, our instance of PHP Censor is at `php-censor.local`, and our PHP Censor project ID is `2`, so the image URL is: `http://php-censor.local/build-status/image/2`. Example: -![](http://phpci.block8.net/build-status/image/2) +![](http://php-censor.local/build-status/image/2) Status Page =========== -PHPCI also provides a public project status page, that is accessible for everyone. +PHP Censor also provides a public project status page, that is accessible for everyone. -You can find the status page at the following location: `http://{PHPCI URL}/build-status/view/{PROJECT ID}` +You can find the status page at the following location: `http://{PHP_CENSOR_URL}/build-status/view/{PROJECT ID}` Example: -http://phpci.block8.net/build-status/view/2 +http://php-censor.local/build-status/view/2 ### Where do I find my project ID? -Go to your instance of PHPCI, and open the project you are interested in. The project ID is the number in the last part of the URL in your browser. +Go to your instance of PHP Censor, and open the project you are interested in. The project ID is the number in the last part of the URL in your browser. Example: -http://phpci.block8.net/project/view/2 ~> PROJECT ID: `2` +http://php-censor.local/project/view/2 ~> PROJECT ID: `2` ### Enable/disable status image and page You can enable or disable access to the public status image and page in your project's settings. diff --git a/docs/en/updating.md b/docs/en/updating.md index 37a3645d..039e3fdf 100644 --- a/docs/en/updating.md +++ b/docs/en/updating.md @@ -1,11 +1,11 @@ -Updating PHPCI --------------- +Updating PHP Censor +------------------- -Updating PHPCI to the latest release, or even dev-master updates is something that will need to be done from time to time. Most of this may be self-explanatory, but for clarity and completeness, it should be added to the documentation. +Updating PHP Censor to the latest release, or even dev-master updates is something that will need to be done from time to time. Most of this may be self-explanatory, but for clarity and completeness, it should be added to the documentation. -1. Go to your PHPCI root folder in a Terminal. +1. Go to your PHP Censor root folder in a Terminal. 2. Pull the latest code. This would look like this: `git pull` -3. Update the PHPCI database: `./console phpci:update` +3. Update the PHP Censor database: `./console phpci:update` 4. Update the composer and its packages: `composer self-update && composer update` -5. Return to the PHPCI admin screens and check your desired plugins are still installed correctly. +5. Return to the PHP Censor admin screens and check your desired plugins are still installed correctly. 7. Run a build to make sure everything is working as expected. diff --git a/docs/en/virtual_host.md b/docs/en/virtual_host.md index 92cb1191..0bb3aa51 100644 --- a/docs/en/virtual_host.md +++ b/docs/en/virtual_host.md @@ -1,7 +1,7 @@ Adding a Virtual Host --------------------- -In order to access the PHPCI web interface, you need to set up a virtual host in your web server. +In order to access the PHP Censor web interface, you need to set up a virtual host in your web server. Below are a few examples of how to do this for various different web servers. @@ -31,7 +31,7 @@ server { Apache Example ============== -For Apache, you can use a standard virtual host, as long as your server supports PHP. All you need to do is add the following to a `.htaccess` file in your PHPCI `/public` directory. +For Apache, you can use a standard virtual host, as long as your server supports PHP. All you need to do is add the following to a `.htaccess` file in your PHP Censor `/public` directory. ``` diff --git a/docs/en/workers/cron.md b/docs/en/workers/cron.md index 67df7201..526c0bae 100644 --- a/docs/en/workers/cron.md +++ b/docs/en/workers/cron.md @@ -1,17 +1,17 @@ Run Builds Using Cron --------------------- -Running builds using cron is a quick and simple method of getting up and running with PHPCI. It also removes the need for PHPCI to be running all the time. +Running builds using cron is a quick and simple method of getting up and running with PHP Censor. It also removes the need for PHP Censor to be running all the time. -If you want a little more control over how PHPCI runs, you may want to [set up the PHPCI daemon](workers/daemon.md) instead. +If you want a little more control over how PHP Censor runs, you may want to [set up the PHP Censor daemon](workers/daemon.md) instead. Setting up the Cron Job ======================= -You'll want to set up PHPCI to run as a regular cronjob, so run `crontab -e` and enter the following: +You'll want to set up PHP Censor to run as a regular cronjob, so run `crontab -e` and enter the following: ```sh * * * * * /usr/bin/php /path/to/phpci/console phpci:run-builds ``` -**Note:** Make sure you change the `/path/to/phpci` to the directory in which you installed PHPCI, and update the PHP path if necessary. +**Note:** Make sure you change the `/path/to/phpci` to the directory in which you installed PHP Censor, and update the PHP path if necessary. diff --git a/docs/en/workers/daemon.md b/docs/en/workers/daemon.md index 4c0e86d5..15561ee6 100644 --- a/docs/en/workers/daemon.md +++ b/docs/en/workers/daemon.md @@ -1,11 +1,11 @@ Run Builds Using a Daemon ------------------------- -The PHPCI daemon runs in the background on your server and continuously checks for new builds. Unless already running a build, the daemon should pick up and start running new builds within seconds of being created. +The PHP Censor daemon runs in the background on your server and continuously checks for new builds. Unless already running a build, the daemon should pick up and start running new builds within seconds of being created. -The daemon is also useful if you want to run multiple PHPCI workers in a virtualised environment (i.e. Docker) +The daemon is also useful if you want to run multiple PHP Censor workers in a virtualised environment (i.e. Docker) -If you want to run PHPCI builds on a regular schedule instead, you should [set up a cron-job](workers/cron.md). +If you want to run PHP Censor builds on a regular schedule instead, you should [set up a cron-job](workers/cron.md). Starting the Daemon =================== diff --git a/docs/en/workers/worker.md b/docs/en/workers/worker.md index af4765ca..4bf97391 100644 --- a/docs/en/workers/worker.md +++ b/docs/en/workers/worker.md @@ -1,9 +1,9 @@ Run Builds Using a Worker ------------------------- -The PHPCI Worker (added in v1.7) runs in the background on your server and waits for new builds to be added to a Beanstalkd queue. Unless already running a build, the worker will pick up and start running new builds almost immediately after their creation. +The PHP Censor Worker runs in the background on your server and waits for new builds to be added to a Beanstalkd queue. Unless already running a build, the worker will pick up and start running new builds almost immediately after their creation. -The worker is the recommended way to run PHPCI builds. You can run several workers all watching one queue, allowing jobs to be run simultaneously without the overhead of polling your MySQL database. +The worker is the recommended way to run PHP Censor builds. You can run several workers all watching one queue, allowing jobs to be run simultaneously without the overhead of polling your MySQL database. If you can't run Beanstalkd on your server, or would prefer to run builds on a regular schedule, you should consider using the [build daemon](workers/daemon.md) or [running builds via Cron](workers/cron.md). @@ -13,25 +13,25 @@ Pre-Requisites * You need to install [Beanstalkd](http://kr.github.io/beanstalkd/) - On Ubuntu, this is as simple as running `apt-get install beanstalkd`. * [Supervisord](http://supervisord.org/) needs to be installed and running on your server. -Setting up the PHPCI Worker -=========================== +Setting up the PHP Censor worker +================================ ### On a new installation -Setting up the worker on a new installation of PHPCI is as simple as entering the appropriate values for your Beanstalkd server hostname and queue name when running the PHPCI installer. By default, the installer assumes that you'll be using beanstalkd on `localhost` and will use the queue name `phpci`. +Setting up the worker on a new installation of PHP Censor is as simple as entering the appropriate values for your Beanstalkd server hostname and queue name when running the PHP Censor installer. By default, the installer assumes that you'll be using beanstalkd on `localhost` and will use the queue name `phpci`. -![PHPCI Worker Installer](https://www.phptesting.org/media/render/f48f63699a04444630352643af18b643) +![PHP Censor Worker Installer](https://www.phptesting.org/media/render/f48f63699a04444630352643af18b643) ### On an existing installation -On an existing installation, to set up the worker, you simply need to add the beanstalkd host and queue names directly into your `/PHPCI/config.yml` file. You should add a `worker` key beneath the `phpci` section, with the properties `host` and `queue` as outlined in the screenshot below: +On an existing installation, to set up the worker, you simply need to add the beanstalkd host and queue names directly into your `config.yml` file. You should add a `worker` key beneath the `phpci` section, with the properties `host` and `queue` as outlined in the screenshot below: -![PHPCI Worker Config](https://www.phptesting.org/media/render/9a88e9298670f2913f5798e68b94c9ed) +![PHP Censor Worker Config](https://www.phptesting.org/media/render/9a88e9298670f2913f5798e68b94c9ed) -Running the PHPCI Worker -======================== +Running the PHP Censor worker +============================= -Once you've set up PHPCI to add your jobs to a beanstalkd queue, you need to start the worker so that it can pick up and run your builds. On most servers, it is best to manage this using supervisord. The following instructions work on Ubuntu, but will need slight amendments for other distributions. +Once you've set up PHP Censor to add your jobs to a beanstalkd queue, you need to start the worker so that it can pick up and run your builds. On most servers, it is best to manage this using supervisord. The following instructions work on Ubuntu, but will need slight amendments for other distributions. Using your preferred text editor, create a file named `phpci.conf` under `/etc/supervisor/conf.d`. In it, enter the following config: @@ -48,9 +48,9 @@ environment=HOME="/home/phpci",USER="phpci" numprocs=2 ``` -You'll need to edit the '/path/to/phpci', the `user` value and the `environment` value to suit your server. The user needs to be an actual system user with suitable permissions to execute PHP and PHPCI. +You'll need to edit the '/path/to/phpci', the `user` value and the `environment` value to suit your server. The user needs to be an actual system user with suitable permissions to execute PHP and PHP Censor. -Once you've created this file, simply restart supervisord using the command `service supervisor restart` and 2 instances of PHPCI's worker should start immediately. You can verify this by running the command `ps aux | grep phpci`, which should give you output as follows: +Once you've created this file, simply restart supervisord using the command `service supervisor restart` and 2 instances of PHP Censor's worker should start immediately. You can verify this by running the command `ps aux | grep phpci`, which should give you output as follows: ``` ➜ ~ ps aux | grep phpci @@ -58,4 +58,4 @@ phpci 19057 0.0 0.9 200244 18720 ? S 03:00 0:01 php /phpci/cons phpci 19058 0.0 0.9 200244 18860 ? S 03:00 0:01 php /phpci/console phpci:worker ``` -That's it! Now, whenever you create a new build in PHPCI, it should start building immediately. +That's it! Now, whenever you create a new build in PHP Censor, it should start building immediately. diff --git a/phpcs.xml b/phpcs.xml index a392a201..82a65c73 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,19 +1,19 @@ - + - Codestyle ruleset for PHPCI + Codestyle ruleset for PHP Censor - PHPCI + PHP Censor - PHPCI/Migrations/* - PHPCI/Model/Base/* - PHPCI/Languages/* - Tests/* + src/PHPCI/Migrations/* + src/PHPCI/Model/Base/* + src/PHPCI/Languages/* + tests/* vendor/* diff --git a/phpmd.xml b/phpmd.xml index 69b822fd..b1b0a56d 100644 --- a/phpmd.xml +++ b/phpmd.xml @@ -1,5 +1,5 @@ - - PHPCI rule set + PHP Censor rule set diff --git a/phpunit.xml b/phpunit.xml index 0b01dcd6..51d85c42 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -12,28 +12,28 @@ bootstrap="./tests/bootstrap.php" > - - + ./tests/PHPCI/Controller - + ./tests/PHPCI/Helper - + ./tests/PHPCI/Logging - + ./tests/PHPCI/Model - + ./tests/PHPCI/Plugin - - + ./tests/PHPCI/Service