From 548a49a3de5426e4c2c2e1dca21371dbd0962ad4 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 17 Apr 2016 12:34:12 +0600 Subject: [PATCH] Refactored structure --- .gitignore | 37 ++++++++++--------- .phpci.yml | 4 +- Dockerfile | 21 ----------- app/config.example.yml | 13 +++++++ .../loggerconfig.example.php | 2 +- phinx.php => app/phinx.php | 2 +- .../pluginconfig.example.php | 1 + console => bin/console | 2 +- console.bat => bin/console.bat | 0 daemonise => bin/daemonise | 2 +- bootstrap.php | 2 +- changelog.md | 10 ----- daemon/.gitignore | 2 - runtime/daemon/.gitkeep | 0 src/PHPCI/Builder.php | 2 +- src/PHPCI/Command/InstallCommand.php | 2 +- src/PHPCI/Command/UpdateCommand.php | 2 +- tests/temp/.gitignore | 2 - tests/temp/.gitkeep | 0 19 files changed, 44 insertions(+), 62 deletions(-) delete mode 100644 Dockerfile create mode 100644 app/config.example.yml rename loggerconfig.php.example => app/loggerconfig.example.php (91%) rename phinx.php => app/phinx.php (94%) rename pluginconfig.php.example => app/pluginconfig.example.php (99%) rename console => bin/console (98%) rename console.bat => bin/console.bat (100%) rename daemonise => bin/daemonise (94%) delete mode 100644 changelog.md delete mode 100644 daemon/.gitignore create mode 100644 runtime/daemon/.gitkeep delete mode 100644 tests/temp/.gitignore create mode 100644 tests/temp/.gitkeep diff --git a/.gitignore b/.gitignore index a140e92f..90ebd84b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,20 @@ -.idea -vendor/ -composer.phar -.DS_Store -.settings/ -.project -.buildpath -app/config.yml -cache -/loggerconfig.php -/pluginconfig.php -src/PHPCI/Model/Migration.php -src/PHPCI/Model/Base/MigrationBase.php -src/PHPCI/Store/MigrationStore.php -src/PHPCI/Store/Base/MigrationStoreBase.php -local_vars.php -tests/PHPCI/config.yml +/.idea +/vendor/ +/composer.phar +/.DS_Store +/.settings +/.project +/.buildpath +/app/config.yml +/runtime/builds +/runtime/daemon +/public/.htaccess +/cache +/app/loggerconfig.php +/app/pluginconfig.php +/src/PHPCI/Model/Migration.php +/src/PHPCI/Model/Base/MigrationBase.php +/src/PHPCI/Store/MigrationStore.php +/src/PHPCI/Store/Base/MigrationStoreBase.php +/local_vars.php +/tests/PHPCI/config.yml diff --git a/.phpci.yml b/.phpci.yml index d6ea0921..e62f9bce 100644 --- a/.phpci.yml +++ b/.phpci.yml @@ -34,5 +34,5 @@ test: broken: email: - committer: true - cc: ["php-ci@googlegroups.com"] + #committer: true + #cc: ["php-ci@googlegroups.com"] diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 5fb6df83..00000000 --- a/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Dan Cryer dan.cryer@block8.co.uk - -RUN echo "deb http://ppa.launchpad.net/ondrej/php5/ubuntu trusty main" >> /etc/apt/sources.list -RUN echo "deb http://archive.ubuntu.com/ubuntu/ precise universe" >> /etc/apt/sources.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C E5267A6C 0xcbcb082a1bb943db -RUN apt-get update - -# Install PHP: -RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mysqlnd - -# Give Git some fake user details to prevent it asking when trying to test merges: -RUN git config --global user.name "PHPCI" -RUN git config --global user.email "hello@php.ci" - -ADD ./ /phpci - -RUN php -r "readfile('https://getcomposer.org/installer');" | php -RUN mv composer.phar /phpci/composer - -CMD /phpci/daemonise phpci:daemonise diff --git a/app/config.example.yml b/app/config.example.yml new file mode 100644 index 00000000..7bb9e501 --- /dev/null +++ b/app/config.example.yml @@ -0,0 +1,13 @@ +b8: + database: + servers: + read: localhost + write: localhost + name: phpci + username: root + password: root +phpci: + url: 'http://phpci.local' + worker: + host: localhost + queue: phpci diff --git a/loggerconfig.php.example b/app/loggerconfig.example.php similarity index 91% rename from loggerconfig.php.example rename to app/loggerconfig.example.php index ffa22204..cb415e4d 100644 --- a/loggerconfig.php.example +++ b/app/loggerconfig.example.php @@ -18,7 +18,7 @@ return array( /** Loggers for the RunCommand */ 'RunCommand' => function() { return array( - new \Monolog\Handler\RotatingFileHandler(__DIR__ . DIRECTORY_SEPARATOR . 'everything',3, \Monolog\Logger::DEBUG), + new \Monolog\Handler\RotatingFileHandler(__DIR__ . DIRECTORY_SEPARATOR . 'everything', 3, \Monolog\Logger::DEBUG), ); }, ); diff --git a/phinx.php b/app/phinx.php similarity index 94% rename from phinx.php rename to app/phinx.php index d64749dd..2f0c3cf4 100644 --- a/phinx.php +++ b/app/phinx.php @@ -8,7 +8,7 @@ * @link https://www.phptesting.org/ */ -require_once(dirname(__FILE__) . '/bootstrap.php'); +require_once(dirname(__FILE__) . '../bootstrap.php'); $writeServers = $config->get('b8.database.servers.write'); diff --git a/pluginconfig.php.example b/app/pluginconfig.example.php similarity index 99% rename from pluginconfig.php.example rename to app/pluginconfig.example.php index 5c182401..e34dd07e 100644 --- a/pluginconfig.php.example +++ b/app/pluginconfig.example.php @@ -1,4 +1,5 @@ registerResource( // This function will be called when the resource is needed. diff --git a/console b/bin/console similarity index 98% rename from console rename to bin/console index 992462e5..751c9e5b 100755 --- a/console +++ b/bin/console @@ -10,7 +10,7 @@ define('PHPCI_IS_CONSOLE', true); -require('bootstrap.php'); +require('../bootstrap.php'); use PHPCI\Command\RunCommand; use PHPCI\Command\RebuildCommand; diff --git a/console.bat b/bin/console.bat similarity index 100% rename from console.bat rename to bin/console.bat diff --git a/daemonise b/bin/daemonise similarity index 94% rename from daemonise rename to bin/daemonise index c6238568..786c9dbb 100755 --- a/daemonise +++ b/bin/daemonise @@ -10,7 +10,7 @@ define('PHPCI_IS_CONSOLE', true); -require('bootstrap.php'); +require('../bootstrap.php'); use PHPCI\Command\DaemoniseCommand; use Symfony\Component\Console\Application; diff --git a/bootstrap.php b/bootstrap.php index 5fe9c8ed..e4831b44 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -47,7 +47,7 @@ require_once(dirname(__FILE__) . '/vendor/autoload.php'); \PHPCI\ErrorHandler::register(); if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) { - $loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); + $loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/app/loggerconfig.php"); } // Load configuration if present: diff --git a/changelog.md b/changelog.md deleted file mode 100644 index 541e4a13..00000000 --- a/changelog.md +++ /dev/null @@ -1,10 +0,0 @@ -# PHPCI Changelog - -## v.Next - -### New Features: -- SSH-based Mercurial clones (Commit: [e98647bd](https://github.com/Block8/PHPCI/commit/e98647bd97d49741242d252514b8703504a62869), PR: [#812](https://github.com/Block8/PHPCI/pull/812)) -- Ability to archive projects (Commit: [1466ad06](https://github.com/Block8/PHPCI/commit/1466ad06ef708cbab2b53112fc59e8c1d70c2e33), PR: [#771](https://github.com/Block8/PHPCI/pull/771)) - -### Bug Fixes and Tweaks: - diff --git a/daemon/.gitignore b/daemon/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/daemon/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/runtime/daemon/.gitkeep b/runtime/daemon/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/PHPCI/Builder.php b/src/PHPCI/Builder.php index 1aed3d3f..c754f4e2 100644 --- a/src/PHPCI/Builder.php +++ b/src/PHPCI/Builder.php @@ -110,7 +110,7 @@ class Builder implements LoggerAwareInterface $this->buildLogger = new BuildLogger($logger, $build); $pluginFactory = $this->buildPluginFactory($build); - $pluginFactory->addConfigFromFile(PHPCI_DIR . "/pluginconfig.php"); + $pluginFactory->addConfigFromFile(PHPCI_DIR . "/app/pluginconfig.php"); $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger); $executorClass = 'PHPCI\Helper\UnixCommandExecutor'; diff --git a/src/PHPCI/Command/InstallCommand.php b/src/PHPCI/Command/InstallCommand.php index 5f5cbd67..fbb63c44 100644 --- a/src/PHPCI/Command/InstallCommand.php +++ b/src/PHPCI/Command/InstallCommand.php @@ -364,7 +364,7 @@ class InstallCommand extends Command $output->write(Lang::get('setting_up_db')); $phinxBinary = escapeshellarg(PHPCI_DIR . 'vendor/bin/phinx'); - $phinxScript = escapeshellarg(PHPCI_DIR . 'phinx.php'); + $phinxScript = escapeshellarg(PHPCI_DIR . 'app/phinx.php'); shell_exec($phinxBinary . ' migrate -c ' . $phinxScript); $output->writeln(''.Lang::get('ok').''); diff --git a/src/PHPCI/Command/UpdateCommand.php b/src/PHPCI/Command/UpdateCommand.php index 13e31f79..2ac94db0 100644 --- a/src/PHPCI/Command/UpdateCommand.php +++ b/src/PHPCI/Command/UpdateCommand.php @@ -53,7 +53,7 @@ class UpdateCommand extends Command $output->write(Lang::get('updating_phpci')); - shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'phinx.php"'); + shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'app/phinx.php"'); $output->writeln(''.Lang::get('ok').''); } diff --git a/tests/temp/.gitignore b/tests/temp/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/tests/temp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tests/temp/.gitkeep b/tests/temp/.gitkeep new file mode 100644 index 00000000..e69de29b