From 5133d85b99b6609285d1a3142611fa11d30ad9f1 Mon Sep 17 00:00:00 2001 From: "alton.crossley" Date: Thu, 23 Apr 2015 14:35:15 -0600 Subject: [PATCH 01/17] adding windows batch file for console --- console.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 console.bat diff --git a/console.bat b/console.bat new file mode 100644 index 00000000..391a2617 --- /dev/null +++ b/console.bat @@ -0,0 +1 @@ +@php console %* \ No newline at end of file From 21bf1045872f6636420bed6b2dcd70a9ed5be7a5 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sat, 25 Apr 2015 09:54:08 +0600 Subject: [PATCH 02/17] Separated strings for 'archived'/'archived_menu' --- PHPCI/Languages/lang.da.php | 1 + PHPCI/Languages/lang.de.php | 1 + PHPCI/Languages/lang.el.php | 1 + PHPCI/Languages/lang.en.php | 1 + PHPCI/Languages/lang.es.php | 1 + PHPCI/Languages/lang.fr.php | 1 + PHPCI/Languages/lang.it.php | 3 ++- PHPCI/Languages/lang.nl.php | 1 + PHPCI/Languages/lang.pl.php | 1 + PHPCI/Languages/lang.ru.php | 3 ++- PHPCI/Languages/lang.uk.php | 3 ++- PHPCI/View/layout.phtml | 2 +- 12 files changed, 15 insertions(+), 4 deletions(-) diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 20e403e1..72959d12 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -114,6 +114,7 @@ i din foretrukne hosting-platform.', 'default_branch' => 'Default branch navn', 'allow_public_status' => 'Tillad offentlig status-side og -billede for dette projekt?', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Gem Projekt', 'error_mercurial' => 'Mercurial repository-URL skal starte med http:// eller https://', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index 8a08e37d..bfc7ae2d 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -115,6 +115,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'default_branch' => 'Name des Standardbranches', 'allow_public_status' => 'Öffentliche Statusseite und -bild für dieses Projekt einschalten?', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Projekt speichern', 'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index cb7d169f..2d988ca0 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -115,6 +115,7 @@ PHPCI', 'default_branch' => 'Προκαθορισμένο όνομα διακλάδωσης', 'allow_public_status' => 'Ενεργοποίηση της σελίδας δημόσιας κατάστασης και την εικόνα για το έργο αυτό;', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Αποθήκευση έργου', 'error_mercurial' => 'Ο σύνδεσμος URL του ευμετάβλητου αποθετηρίου πρέπει να ξεκινάει με http:// ή https://', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index d6c48754..b0a0660e 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -116,6 +116,7 @@ PHPCI', 'default_branch' => 'Default branch name', 'allow_public_status' => 'Enable public status page and image for this project?', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Save Project', 'error_mercurial' => 'Mercurial repository URL must be start with http:// or https://', diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php index 95a6eb73..1b7b33f7 100644 --- a/PHPCI/Languages/lang.es.php +++ b/PHPCI/Languages/lang.es.php @@ -115,6 +115,7 @@ PHPCI', 'default_branch' => 'Nombre de la rama por defecto', 'allow_public_status' => '¿Activar página pública con el estado del proyecto?', 'archived' => 'Archivado', + 'archived_menu' => 'Archivado', 'save_project' => 'Guardar Proyecto', 'error_mercurial' => 'La URL del repositorio de Mercurial debe comenzar con http:// or https://', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index f1ad7129..dd3e6256 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -115,6 +115,7 @@ PHPCI', 'default_branch' => 'Nom de la branche par défaut', 'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Enregistrer le projet', 'error_mercurial' => 'Les URLs de dépôt Mercurial doivent commencer par http:// ou https://', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index ff326d14..2c7bbea3 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -113,8 +113,9 @@ PHPCI', (se non puoi aggiungere il file phpci.yml nel repository di questo progetto)', 'default_branch' => 'Nome del branch di default', 'allow_public_status' => 'Vuoi rendere pubblica la pagina dello stato e l\'immagine per questo progetto?', - 'save_project' => 'Salva il Progetto', 'archived' => 'Archived', + 'archived_menu' => 'Archived', + 'save_project' => 'Salva il Progetto', 'error_mercurial' => 'L\'URL del repository Mercurial URL deve iniziare con http:// o https://', 'error_remote' => 'L\'URL del repository deve iniziare con git://, http:// o https://', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index e0638aaf..1f46eb71 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -115,6 +115,7 @@ van je gekozen source code hosting platform', 'default_branch' => 'Standaard branch naam', 'allow_public_status' => 'Publieke statuspagina en afbeelding beschikbaar maken voor dit project?', 'archived' => 'Archived', + 'archived_menu' => 'Archived', 'save_project' => 'Project opslaan', 'error_mercurial' => 'Mercurial repository URL dient te starten met http:// of https://', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index d6f95ad6..7e35056c 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -116,6 +116,7 @@ od wybranego kodu źródłowego platformy hostingowej.', 'default_branch' => 'Domyślna nazwa gałęzi', 'allow_public_status' => 'Włączyć status publiczny dla tego projektu?', 'archived' => 'W archiwum', + 'archived_menu' => 'W archiwum', 'save_project' => 'Zachowaj Projekt', 'error_mercurial' => 'URL repozytorium Mercurialnego powinno zaczynać się od http:// and https://', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index aa0f40fb..68f52e16 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -113,7 +113,8 @@ PHPCI', (если вы не добавили файл phpci.yml в репозиторий вашего проекта)', 'default_branch' => 'Ветка по умолчанию', 'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта', - 'archived' => 'Запакован', + 'archived' => 'Архивный', + 'archived_menu' => 'Архив', 'save_project' => 'Сохранить проект', 'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index a3ca1b37..7071f059 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -113,7 +113,8 @@ PHPCI', (якщо ви не додали файл phpci.yml до репозиторію вашого проекту)', 'default_branch' => 'Назва гілки за замовчуванням', 'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?', - 'archived' => 'Archived', + 'archived' => 'Архівний', + 'archived_menu' => 'Архів', 'save_project' => 'Зберегти проект', 'error_mercurial' => 'URL репозиторію Mercurial повинен починатись із http:// або https://', diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 82eabfe5..ca462475 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -240,7 +240,7 @@
  • - +
    • From 1c864cebedc6ae5850930caf531bc5202bd2db82 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sat, 23 May 2015 15:40:49 +0600 Subject: [PATCH 03/17] Fixed TapParser parse fail with valid data + added tests --- PHPCI/Plugin/Util/TapParser.php | 13 ++++---- Tests/PHPCI/Plugin/Util/TapParserTest.php | 36 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 18772a6a..132c5cce 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -13,9 +13,10 @@ use Symfony\Component\Yaml\Yaml; class TapParser { const TEST_COUNTS_PATTERN = '/^\d+\.\.(\d+)/'; - const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i'; - const TEST_YAML_START = '/^(\s*)---/'; - const TEST_DIAGNOSTIC = '/^#/'; + const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i'; + const TEST_YAML_START = '/^(\s*)---/'; + const TEST_DIAGNOSTIC = '/^#/'; + const TEST_COVERAGE = '/^Generating/'; /** * @var string @@ -81,7 +82,7 @@ class TapParser $line = $this->nextLine(); } - if (count($this->results) !== $this->testCount) { + if (false !== $this->testCount && count($this->results) !== $this->testCount) { throw new Exception(Lang::get('tap_error')); } @@ -126,13 +127,15 @@ class TapParser /** Parse a single line. * * @param string $line + * + * @throws Exception */ protected function parseLine($line) { if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { $this->testCount = intval($matches[1]); - } elseif (preg_match(self::TEST_DIAGNOSTIC, $line)) { + } elseif (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { return; } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { diff --git a/Tests/PHPCI/Plugin/Util/TapParserTest.php b/Tests/PHPCI/Plugin/Util/TapParserTest.php index 732a44a6..8d31d7c9 100644 --- a/Tests/PHPCI/Plugin/Util/TapParserTest.php +++ b/Tests/PHPCI/Plugin/Util/TapParserTest.php @@ -23,6 +23,28 @@ ok 1 - SomeTest::testAnother not ok 1..2 Trailing garbage ! +TAP; + $parser = new TapParser($content); + $result = $parser->parse(); + + $this->assertEquals(array( + array('pass' => true, 'severity' => 'success', 'message' => 'SomeTest::testAnother'), + array('pass' => false, 'severity' => 'fail', 'message' => ''), + ), $result); + + $this->assertEquals(1, $parser->getTotalFailures()); + } + + public function testSimple2() + { + $content = <<parse(); @@ -48,6 +70,20 @@ TAP; $parser->parse(); } + public function testTapCoverage() + { + $content = <<parse(); + + $this->assertEquals(array(), $result); + } + /** * @expectedException \Exception * @expectedExceptionMessageRegExp /Duplicated TAP/ From c20ee0533bb1ba61573b04a442762b41ac046e11 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 24 May 2015 12:39:27 +0600 Subject: [PATCH 04/17] Fixed TapParser::parseLine Cyclomatic Complexity --- PHPCI/Plugin/Util/TapParser.php | 112 +++++++++++++++++++++++++------- 1 file changed, 88 insertions(+), 24 deletions(-) diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 132c5cce..25d3a2a5 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -124,6 +124,79 @@ class TapParser return false; } + /** + * @param string $line + * + * @return boolean + */ + protected function testCountLine($line) + { + if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { + $this->testCount = intval($matches[1]); + + return true; + } + + return false; + } + + /** + * @param string $line + * + * @return boolean + */ + protected function testLine($line) + { + if (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { + $this->results[] = $this->processTestLine( + $matches[1], + isset($matches[2]) ? $matches[2] : '', + isset($matches[3]) ? $matches[3] : null, + isset($matches[4]) ? $matches[4] : null + ); + + return true; + } + + return false; + } + + /** + * @param string $line + * + * @return boolean + */ + protected function yamlLine($line) + { + if (preg_match(self::TEST_YAML_START, $line, $matches)) { + $diagnostic = $this->processYamlBlock($matches[1]); + $test = array_pop($this->results); + if (isset($test['message'], $diagnostic['message'])) { + $test['message'] .= PHP_EOL . $diagnostic['message']; + unset($diagnostic['message']); + } + $this->results[] = array_replace($test, $diagnostic); + + return true; + } + + return false; + } + + /** + * @param string $line + * + * @return boolean + */ + protected function garbageLine($line) + { + if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { + return true; + } + + return false; + } + /** Parse a single line. * * @param string $line @@ -132,32 +205,23 @@ class TapParser */ protected function parseLine($line) { - if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { - $this->testCount = intval($matches[1]); - - } elseif (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { + if ($this->garbageLine($line)) { return; - - } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { - $this->results[] = $this->processTestLine( - $matches[1], - isset($matches[2]) ? $matches[2] : '', - isset($matches[3]) ? $matches[3] : null, - isset($matches[4]) ? $matches[4] : null - ); - - } elseif (preg_match(self::TEST_YAML_START, $line, $matches)) { - $diagnostic = $this->processYamlBlock($matches[1]); - $test = array_pop($this->results); - if (isset($test['message'], $diagnostic['message'])) { - $test['message'] .= PHP_EOL . $diagnostic['message']; - unset($diagnostic['message']); - } - $this->results[] = array_replace($test, $diagnostic); - - } else { - throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line)); } + + if ($this->testCountLine($line)) { + return; + } + + if ($this->testLine($line)) { + return; + } + + if ($this->yamlLine($line)) { + return; + } + + throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line)); } /** From 3f02e63c92bd99fe7990a6f9b2aa23f1b978d19b Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 24 May 2015 12:43:43 +0600 Subject: [PATCH 05/17] Fixed TapParser::parseLine Cyclomatic Complexity --- PHPCI/Plugin/Util/TapParser.php | 36 ++++----------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 25d3a2a5..451b73f0 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -124,22 +124,6 @@ class TapParser return false; } - /** - * @param string $line - * - * @return boolean - */ - protected function testCountLine($line) - { - if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { - $this->testCount = intval($matches[1]); - - return true; - } - - return false; - } - /** * @param string $line * @@ -183,20 +167,6 @@ class TapParser return false; } - /** - * @param string $line - * - * @return boolean - */ - protected function garbageLine($line) - { - if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { - return true; - } - - return false; - } - /** Parse a single line. * * @param string $line @@ -205,11 +175,13 @@ class TapParser */ protected function parseLine($line) { - if ($this->garbageLine($line)) { + if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { return; } - if ($this->testCountLine($line)) { + if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { + $this->testCount = intval($matches[1]); + return; } From 853107027b64d260225b678cde45124b0ac0c544 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 24 May 2015 14:20:51 +0600 Subject: [PATCH 06/17] Fixed GithubBuild::getDiffLineNumber method for correct phpcpd work --- PHPCI/Model/Build/GithubBuild.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index d6b2b7b9..81510ae0 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -201,6 +201,8 @@ class GithubBuild extends RemoteGitBuild */ protected function getDiffLineNumber(Builder $builder, $file, $line) { + $line = (integer)$line; + $builder->logExecOutput(false); $prNumber = $this->getExtra('pull_request_number'); From 2672908225679aeefb3cba8a1ba353c12e9face7 Mon Sep 17 00:00:00 2001 From: mulleto Date: Fri, 29 May 2015 08:26:47 +0200 Subject: [PATCH 07/17] Make check for Pdepend output dir more robust. Before this fix, the pdepend module would check for "is_writable", which returns false even when the directory does not exist. I suggest to a) attempt to crete the dir if it does not exist, and b) make the error message more explanatory in case the dir cannot be created or is not accessible. --- PHPCI/Plugin/Pdepend.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Pdepend.php b/PHPCI/Plugin/Pdepend.php index 73b669c1..faef406d 100644 --- a/PHPCI/Plugin/Pdepend.php +++ b/PHPCI/Plugin/Pdepend.php @@ -73,8 +73,11 @@ class Pdepend implements \PHPCI\Plugin */ public function execute() { + if (!file_exists($this->location)) { + mkdir($this->location); + } if (!is_writable($this->location)) { - throw new \Exception(sprintf('The location %s is not writable.', $this->location)); + throw new \Exception(sprintf('The location %s is not writable or does not exist.', $this->location)); } $pdepend = $this->phpci->findBinary('pdepend'); From 9efd8e06dc23bda7102058e4a1f29bb72f8335ab Mon Sep 17 00:00:00 2001 From: Joe Huss Date: Thu, 25 Jun 2015 07:48:26 -0400 Subject: [PATCH 08/17] Contribution Type: improvement / new feature Primary Area: plugins Description of change: Implemented using the same changes mentioned here: https://www.phptesting.org/forums/topic/5-mysql-plugin-setup/ Allows you to specify a hostname for your mysql connection. Not my original code just patching it into the current source and made a branchs/push for it. (i.e. Created a new plugin named ToolX, used library X to implement, see link) --- PHPCI/Plugin/Mysql.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php index 5c36a09f..fdb521ef 100644 --- a/PHPCI/Plugin/Mysql.php +++ b/PHPCI/Plugin/Mysql.php @@ -166,10 +166,11 @@ class Mysql implements \PHPCI\Plugin $args = array( ':import_file' => escapeshellarg($import_file), ':decomp_cmd' => $decomp_cmd, + ':host' => escapeshellarg($this->host), ':user' => escapeshellarg($this->user), ':pass' => escapeshellarg($this->pass), ':database' => ($database === null)? '': escapeshellarg($database), ); - return strtr('cat :import_file :decomp_cmd | mysql -u:user -p:pass :database', $args); + return strtr('cat :import_file :decomp_cmd | mysql -h:host -u:user -p:pass :database', $args); } } From d2c512d94b32a230234a8e829f307a45933d3f5d Mon Sep 17 00:00:00 2001 From: Mark Robinson Date: Thu, 25 Jun 2015 15:21:23 +0100 Subject: [PATCH 09/17] Corrected a number of minor spelling errors. Originally observed that "successful" was misspelled "succesfull" on the build view page. While correcting that, a number of other spelling errors were also corrected. --- PHPCI/Controller/WebhookController.php | 2 +- PHPCI/Helper/AnsiConverter.php | 6 +++--- PHPCI/Helper/LoginIsDisabled.php | 2 +- PHPCI/Languages/lang.da.php | 2 +- PHPCI/Languages/lang.de.php | 2 +- PHPCI/Languages/lang.el.php | 2 +- PHPCI/Languages/lang.en.php | 2 +- PHPCI/Languages/lang.it.php | 2 +- PHPCI/Languages/lang.nl.php | 2 +- PHPCI/Languages/lang.pl.php | 2 +- PHPCI/Languages/lang.ru.php | 2 +- PHPCI/Languages/lang.uk.php | 2 +- PHPCI/Plugin/Email.php | 2 +- PHPCI/Plugin/PhpCpd.php | 2 +- PHPCI/Plugin/PhpMessDetector.php | 4 ++-- PHPCI/Plugin/Util/TapParser.php | 4 ++-- PHPCI/ProcessControl/PosixProcessControl.php | 2 +- Tests/PHPCI/Command/CreateBuildCommandTest.php | 2 +- Tests/PHPCI/Command/InstallCommandTest.php | 4 ++-- Tests/PHPCI/Plugin/EmailTest.php | 4 ++-- Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php | 2 +- bootstrap.php | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 45a775ad..5848e961 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -170,7 +170,7 @@ class WebhookController extends \b8\Controller protected function githubCommitRequest(Project $project, array $payload) { // Github sends a payload when you close a pull request with a - // non-existant commit. We don't want this. + // non-existent commit. We don't want this. if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') { return array('status' => 'ignored'); } diff --git a/PHPCI/Helper/AnsiConverter.php b/PHPCI/Helper/AnsiConverter.php index a5e42269..7df6663c 100644 --- a/PHPCI/Helper/AnsiConverter.php +++ b/PHPCI/Helper/AnsiConverter.php @@ -21,7 +21,7 @@ final class AnsiConverter static private $converter = null; /** - * Initialize the singletion. + * Initialize the singleton. * * @return AnsiToHtmlConverter */ @@ -35,7 +35,7 @@ final class AnsiConverter } /** - * Convert a text containing ANSI colr sequences into HTML code. + * Convert a text containing ANSI color sequences into HTML code. * * @param string $text The text to convert * @@ -47,7 +47,7 @@ final class AnsiConverter } /** - * Do not instanciate this class. + * Do not instantiate this class. */ private function __construct() { diff --git a/PHPCI/Helper/LoginIsDisabled.php b/PHPCI/Helper/LoginIsDisabled.php index 437b95cd..ec23858c 100644 --- a/PHPCI/Helper/LoginIsDisabled.php +++ b/PHPCI/Helper/LoginIsDisabled.php @@ -12,7 +12,7 @@ namespace PHPCI\Helper; use b8\Config; /** -* Login Is Disabled Helper - Checks if login is disalbed in the view +* Login Is Disabled Helper - Checks if login is disabled in the view * @author Stephen Ball * @package PHPCI * @subpackage Web diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 20e403e1..c5001b52 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -203,7 +203,7 @@ Services sektionen under dit Bitbucket-repository.', 'build_finished' => 'Build Afsluttet', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index f866a4de..3539d6d1 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -210,7 +210,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'build_finished' => 'Build abgeschlossen', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index cb7d169f..5021ec16 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -204,7 +204,7 @@ Services του Bitbucket αποθετηρίου σας.', 'build_finished' => 'Η κατασκευή ολοκληρώθηκε', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 9729d746..223db7e2 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -213,7 +213,7 @@ PHPCI', 'build_finished' => 'Build Finished', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index ff326d14..e268172b 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -206,7 +206,7 @@ PHPCI', 'build_finished' => 'Build Terminata', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index e0638aaf..a39ec4d7 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -204,7 +204,7 @@ Services sectie van je Bitbucket repository toegevoegd worden.', 'build_finished' => 'Build beëindigd', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index d6f95ad6..baec665d 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -207,7 +207,7 @@ Services repozytoria Bitbucket.', 'build_finished' => 'Budowanie Zakończone', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index aa0f40fb..aaf4cddf 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -202,7 +202,7 @@ PHPCI', 'build_finished' => 'Сборка окончена', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index a3ca1b37..5efd226e 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -204,7 +204,7 @@ PHPCI', 'build_finished' => 'Збірка завершена', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Succesfull: %d', + 'test_success' => 'Successful: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index c2638860..8faa5bb7 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -134,7 +134,7 @@ class Email implements \PHPCI\Plugin * Send an email to a list of specified subjects. * * @param array $toAddresses - * List of destinatary of message. + * List of destination addresses for message. * @param string $subject * Mail subject * @param string $body diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php index 6433308f..953c3ea7 100644 --- a/PHPCI/Plugin/PhpCpd.php +++ b/PHPCI/Plugin/PhpCpd.php @@ -28,7 +28,7 @@ class PhpCpd implements \PHPCI\Plugin /** * @var string, based on the assumption the root may not hold the code to be - * tested, exteds the base path + * tested, extends the base path */ protected $path; diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index b02f5f09..4d075fda 100644 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -38,7 +38,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin /** * @var string, based on the assumption the root may not hold the code to be - * tested, exteds the base path only if the provided path is relative. Absolute + * tested, extends the base path only if the provided path is relative. Absolute * paths are used verbatim */ protected $path; @@ -50,7 +50,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin /** * Array of PHPMD rules. Can be one of the builtins (codesize, unusedcode, naming, design, controversial) - * or a filenname (detected by checking for a / in it), either absolute or relative to the project root. + * or a filename (detected by checking for a / in it), either absolute or relative to the project root. * @var array */ protected $rules; diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 18772a6a..8d3ec382 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -73,7 +73,7 @@ class TapParser $line = $this->nextLine(); if ($line === $header) { - throw new Exception("Duplicated TAP log, please check the configration."); + throw new Exception("Duplicated TAP log, please check the configuration."); } while ($line !== false && ($this->testCount === false || count($this->results) < $this->testCount)) { @@ -96,7 +96,7 @@ class TapParser */ protected function findTapLog() { - // Look for the beggning of the TAP output + // Look for the beginning of the TAP output do { $header = $this->nextLine(); } while ($header !== false && substr($header, 0, 12) !== 'TAP version '); diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/PHPCI/ProcessControl/PosixProcessControl.php index 710ba9f1..bac55ee2 100644 --- a/PHPCI/ProcessControl/PosixProcessControl.php +++ b/PHPCI/ProcessControl/PosixProcessControl.php @@ -31,7 +31,7 @@ class PosixProcessControl implements ProcessControlInterface * Sends a TERMINATE or KILL signal to the process using posix_kill. * * @param int $pid - * @param bool $forcefully Whetehr to send TERMINATE (false) or KILL (true). + * @param bool $forcefully Whether to send TERMINATE (false) or KILL (true). */ public function kill($pid, $forcefully = false) { diff --git a/Tests/PHPCI/Command/CreateBuildCommandTest.php b/Tests/PHPCI/Command/CreateBuildCommandTest.php index 59395de5..e82ae517 100644 --- a/Tests/PHPCI/Command/CreateBuildCommandTest.php +++ b/Tests/PHPCI/Command/CreateBuildCommandTest.php @@ -78,7 +78,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase /** * @expectedException \InvalidArgumentException */ - public function testExecuteWithUnknowProjectId() + public function testExecuteWithUnknownProjectId() { $commandTester = $this->getCommandTester(); $commandTester->execute(array('projectId' => 2)); diff --git a/Tests/PHPCI/Command/InstallCommandTest.php b/Tests/PHPCI/Command/InstallCommandTest.php index 73b83462..040a4803 100644 --- a/Tests/PHPCI/Command/InstallCommandTest.php +++ b/Tests/PHPCI/Command/InstallCommandTest.php @@ -175,7 +175,7 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase $this->assertEquals('testedvalue', $this->config['b8']['database']['name']); } - public function testDatabaseUserameConfig() + public function testDatabaseUserConfig() { $dialog = $this->getDialogHelperMock(); @@ -243,7 +243,7 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase $this->assertEquals('test@phpci.com', $this->admin['mail']); } - public function testAdminUserameConfig() + public function testAdminNameConfig() { $dialog = $this->getDialogHelperMock(); diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index bb039ca4..0787d41d 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -236,11 +236,11 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_UniqueRecipientsWithCommiter() + public function testExecute_UniqueRecipientsWithCommitter() { $this->loadEmailPluginWithOptions( array( - 'commiter' => true, + 'committer' => true, 'addresses' => array('test-receiver@example.com', 'committer@test.com') ) ); diff --git a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php index 1b674e9c..4af2d7a6 100644 --- a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php +++ b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php @@ -15,7 +15,7 @@ use PHPCI\Plugin\Util\FilesPluginInformation; class FilesPluginInformationTest extends \PHPUnit_Framework_TestCase { - public function testGetInstalledPlugins_returnsObjectes() + public function testGetInstalledPlugins_returnsObjects() { $pluginDirPath = realpath(__DIR__ . "/../../../../PHPCI/Plugin/"); $test = FilesPluginInformation::newFromDir($pluginDirPath); diff --git a/bootstrap.php b/bootstrap.php index 18d91d07..ca30f940 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -62,7 +62,7 @@ if (file_exists($configFile)) { /** * Allow to modify PHPCI configuration without modify versioned code. - * Dameons should be killed to apply changes in the file. + * Daemons should be killed to apply changes in the file. * * @ticket 781 */ From 8a3d7605d5846e92732e2fe3948db14985d447e2 Mon Sep 17 00:00:00 2001 From: DELORME Jonathan Date: Tue, 30 Jun 2015 11:43:25 +0200 Subject: [PATCH 10/17] Fixed a css issue with Block8 logo In Chrome (Android L), when you focus an input, the Block8 logo overrides the view. See : http://s10.postimg.org/d5ffp7dwp/2015_06_30_07_57_03.png --- PHPCI/View/Session.phtml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/PHPCI/View/Session.phtml b/PHPCI/View/Session.phtml index 9975d697..c28d9bfc 100644 --- a/PHPCI/View/Session.phtml +++ b/PHPCI/View/Session.phtml @@ -67,6 +67,14 @@ bottom: 50px; right: 50px; } + + @media(max-width:767px) { + #logo { + position: inherit; + margin: 0 auto; + margin-top: 50px; + } + } #logo:hover { background-image: url('https://www.block8.co.uk/assets/images/b8-phpci-logo.png'); From f55b336900af5dda7ab50a73416f099624ff5cc6 Mon Sep 17 00:00:00 2001 From: Mehmet Ali Ergut Date: Tue, 12 May 2015 00:29:45 +0300 Subject: [PATCH 11/17] Fixes default value for PHP Cs Fixer ( #833 ) --- PHPCI/Plugin/PhpCsFixer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php index e07db718..7a173e64 100644 --- a/PHPCI/Plugin/PhpCsFixer.php +++ b/PHPCI/Plugin/PhpCsFixer.php @@ -32,10 +32,10 @@ class PhpCsFixer implements \PHPCI\Plugin protected $build; protected $workingDir = ''; - protected $level = ' --level=all'; + protected $level = ' --level=psr2'; protected $verbose = ''; protected $diff = ''; - protected $levels = array('psr0', 'psr1', 'psr2', 'all'); + protected $levels = array('psr0', 'psr1', 'psr2', 'symfony'); /** * Standard Constructor From 668ee6761759f98efd230af03da8ec5f941db6e3 Mon Sep 17 00:00:00 2001 From: Adam Cooper Date: Tue, 6 Oct 2015 10:53:23 +0100 Subject: [PATCH 12/17] Incorrect docblock The "optionally" is not true, the config file is now required. --- PHPCI/Plugin/Codeception.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index 6d020210..79f05cdf 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -99,7 +99,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin } /** - * Runs Codeception tests, optionally using specified config file(s). + * Runs Codeception tests */ public function execute() { From 8845fe63d9594e7c0ae9e865f6514870de8aab56 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Sat, 10 Oct 2015 09:22:53 -0700 Subject: [PATCH 13/17] Move id attribute to outer div to hide the result component completely This will allow the other non-hidden components to properly reflow on the page. --- public/assets/js/build.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/assets/js/build.js b/public/assets/js/build.js index 0b1d95dc..c8bf588a 100644 --- a/public/assets/js/build.js +++ b/public/assets/js/build.js @@ -108,8 +108,8 @@ var Build = Class.extend({ output = $('
    ').append(output); } - var container = $('
    ').addClass('ui-plugin ' + plugin.css); - var content = $('
    ').attr('id', plugin.id).append(output); + var container = $('
    ').addClass('ui-plugin ' + plugin.css).attr('id', plugin.id); + var content = $('
    ').append(output); content.addClass('box box-default'); if (plugin.title) { @@ -145,4 +145,4 @@ var Build = Class.extend({ } }) -}); \ No newline at end of file +}); From c474a5c73a388b93a4daad1d9fcce03fc664f4c1 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Sat, 10 Oct 2015 09:54:01 -0700 Subject: [PATCH 14/17] Check if datepicker locale file exists --- PHPCI/View/layout.phtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index cbd98161..e8c8b13a 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -143,7 +143,7 @@ - + User()->getIsAdmin()): ?>
  • @@ -299,7 +299,9 @@ + + From 21b59ab4d4c41157245611566bd9862c7d2b9c7f Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Sat, 10 Oct 2015 10:07:31 -0700 Subject: [PATCH 15/17] Add missing sprintf.min.map file --- public/assets/js/sprintf.min.map | 1 + 1 file changed, 1 insertion(+) create mode 100644 public/assets/js/sprintf.min.map diff --git a/public/assets/js/sprintf.min.map b/public/assets/js/sprintf.min.map new file mode 100644 index 00000000..bced4235 --- /dev/null +++ b/public/assets/js/sprintf.min.map @@ -0,0 +1 @@ +{"version":3,"file":"sprintf.min.js","sources":["../src/sprintf.js"],"names":["window","sprintf","key","arguments","cache","hasOwnProperty","parse","format","call","get_type","variable","Object","prototype","toString","slice","toLowerCase","str_repeat","input","multiplier","Array","join","re","not_string","number","json","not_json","text","modulo","placeholder","key_access","index_access","sign","parse_tree","argv","arg","i","k","match","pad","pad_character","pad_length","cursor","tree_length","length","node_type","output","is_positive","Error","test","isNaN","TypeError","String","fromCharCode","parseInt","JSON","stringify","toExponential","parseFloat","toFixed","toPrecision","substring","toUpperCase","replace","charAt","fmt","_fmt","arg_names","exec","SyntaxError","field_list","replacement_field","field_match","vsprintf","_argv","splice","apply","exports","define","amd","this"],"mappings":"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"} From dc6e4ed6b46b35c1c3d8b00a0808dbfeceb87937 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Mon, 12 Oct 2015 12:23:55 -0700 Subject: [PATCH 16/17] Add logo icons --- public/assets/img/logo-icon.png | Bin 0 -> 13300 bytes public/assets/img/logo-icon.svg | 1 + 2 files changed, 1 insertion(+) create mode 100644 public/assets/img/logo-icon.png create mode 100644 public/assets/img/logo-icon.svg diff --git a/public/assets/img/logo-icon.png b/public/assets/img/logo-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eb377672722fcf7d370cfd7b958f961af7ef673f GIT binary patch literal 13300 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 literal 0 HcmV?d00001 diff --git a/public/assets/img/logo-icon.svg b/public/assets/img/logo-icon.svg new file mode 100644 index 00000000..1c44f696 --- /dev/null +++ b/public/assets/img/logo-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file From 156c635af5291530aa58faff623e54d9307e2e2a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 13 Oct 2015 09:59:48 +0100 Subject: [PATCH 17/17] Updating deps --- composer.json | 3 +- composer.lock | 293 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 283 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index fad44cd9..277e1b55 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,8 @@ "pimple/pimple": "~1.1", "robmorgan/phinx": "~0.4", "sensiolabs/ansi-to-html": "~1.1", - "pda/pheanstalk": "~3.1" + "pda/pheanstalk": "~3.1", + "maknz/slack": "~1.7" }, "require-dev": { diff --git a/composer.lock b/composer.lock index b399ce10..ab679aee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "22ff64c3aa3c951901e6332784ab617e", - "content-hash": "177ce296bc661eb8bff467cbd10a88e4", + "hash": "2acdd123806a7eda47a4a16614e560bb", + "content-hash": "9288b6bc9e7061c6338b039b70d29ea1", "packages": [ { "name": "block8/b8framework", @@ -54,6 +54,177 @@ ], "time": "2015-10-05 10:50:20" }, + { + "name": "guzzlehttp/guzzle", + "version": "6.1.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81", + "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.1-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2015-09-08 17:36:26" + }, + { + "name": "guzzlehttp/promises", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "97fe7210def29451ec74923b27e552238defd75a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/97fe7210def29451ec74923b27e552238defd75a", + "reference": "97fe7210def29451ec74923b27e552238defd75a", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2015-08-15 19:37:21" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", + "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2015-08-15 19:32:36" + }, { "name": "ircmaxell/password-compat", "version": "v1.0.4", @@ -96,6 +267,55 @@ ], "time": "2014-11-20 16:49:30" }, + { + "name": "maknz/slack", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/maknz/slack.git", + "reference": "7f21fefc70c76b304adc1b3a780c8740dfcfb595" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maknz/slack/zipball/7f21fefc70c76b304adc1b3a780c8740dfcfb595", + "reference": "7f21fefc70c76b304adc1b3a780c8740dfcfb595", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "guzzlehttp/guzzle": "~6.0|~5.0|~4.0", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "4.2.*" + }, + "suggest": { + "illuminate/support": "Required for Laravel support" + }, + "type": "library", + "autoload": { + "psr-4": { + "Maknz\\Slack\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "maknz", + "email": "github@mak.geek.nz" + } + ], + "description": "A simple PHP package for sending messages to Slack, with a focus on ease of use and elegant syntax. Includes Laravel support out of the box.", + "keywords": [ + "laravel", + "slack" + ], + "time": "2015-06-03 03:35:16" + }, { "name": "monolog/monolog", "version": "1.17.1", @@ -270,6 +490,55 @@ ], "time": "2013-11-22 08:30:29" }, + { + "name": "psr/http-message", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2015-05-04 20:22:00" + }, { "name": "psr/log", "version": "1.0.0", @@ -1337,16 +1606,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.11", + "version": "4.8.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5" + "reference": "00194eb95989190a73198390ceca081ad3441a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00194eb95989190a73198390ceca081ad3441a7f", + "reference": "00194eb95989190a73198390ceca081ad3441a7f", "shasum": "" }, "require": { @@ -1405,7 +1674,7 @@ "testing", "xunit" ], - "time": "2015-10-07 10:39:46" + "time": "2015-10-12 03:36:47" }, { "name": "phpunit/phpunit-mock-objects", @@ -1781,16 +2050,16 @@ }, { "name": "sebastian/global-state", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23af31f402993cfd94e99cbc4b782e9a78eb0e97" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23af31f402993cfd94e99cbc4b782e9a78eb0e97", - "reference": "23af31f402993cfd94e99cbc4b782e9a78eb0e97", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { @@ -1828,7 +2097,7 @@ "keywords": [ "global state" ], - "time": "2015-06-21 15:11:22" + "time": "2015-10-12 03:26:01" }, { "name": "sebastian/recursion-context",