@@ -2,13 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Fabrica\Models\Infra\Ci\Build; |
4 | 4 | |
5 | -use GuzzleHttp\Client; |
|
6 | -use Fabrica\Tools\Builder; |
|
7 | 5 | use Fabrica\Helper\Bitbucket; |
8 | -use Fabrica\Tools\Config; |
|
6 | +use Fabrica\Helper\Diff; |
|
9 | 7 | use Fabrica\Models\Infra\Ci\Build; |
10 | 8 | use Fabrica\Models\Infra\Ci\BuildError; |
11 | -use Fabrica\Helper\Diff; |
|
9 | +use Fabrica\Tools\Builder; |
|
10 | +use Fabrica\Tools\Config; |
|
11 | +use GuzzleHttp\Client; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * BitBucket Build Model |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | class Project extends BaseProject |
16 | 16 | { |
17 | 17 | /** |
18 | - * @return ProjectGroup|null |
|
18 | + * @return null|\PHPCensor\Model\ProjectGroup |
|
19 | 19 | */ |
20 | 20 | public function getGroup() |
21 | 21 | { |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @param string $branch |
49 | 49 | * @param null $status |
50 | 50 | * |
51 | - * @return mixed|null |
|
51 | + * @return Build|null |
|
52 | 52 | */ |
53 | 53 | public function getLatestBuild($branch = 'master', $status = null) |
54 | 54 | { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * |
78 | 78 | * @param string $branch |
79 | 79 | * |
80 | - * @return mixed|null |
|
80 | + * @return Build|null |
|
81 | 81 | */ |
82 | 82 | public function getPreviousBuild($branch = 'master') |
83 | 83 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Fabrica\Models\Infra\Ci\Model; |
4 | 4 | |
5 | -use Fabrica\Tools\Store\Factory; |
|
5 | +use Fabrica\Models\Infra\Ci\Base\Project as BaseProject; |
|
6 | 6 | use Fabrica\Tools\Store\EnvironmentStore; |
7 | +use Fabrica\Tools\Store\Factory; |
|
7 | 8 | use Fabrica\Tools\Store\ProjectGroupStore; |
8 | -use Symfony\Component\Yaml\Parser as YamlParser; |
|
9 | 9 | use Symfony\Component\Yaml\Dumper as YamlDumper; |
10 | -use Fabrica\Models\Infra\Ci\Base\Project as BaseProject; |
|
10 | +use Symfony\Component\Yaml\Parser as YamlParser; |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @author Ricardo Sierra <[email protected]> |
@@ -2,12 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace Fabrica\Models\Infra; |
4 | 4 | |
5 | -use Support\Models\Base; |
|
6 | 5 | use Fabrica\Helper\File; |
6 | +use Support\Models\Base; |
|
7 | 7 | |
8 | 8 | // set_include_path(get_include_path() . get_include_path().'/phpseclib'); |
9 | 9 | // include('phpseclib/Net/SSH2.php'); |
10 | -use phpseclib\Net\SSH2; |
|
11 | 10 | use phpseclib\Crypt\RSA as Crypt_RSA; |
12 | 11 | |
13 | 12 | class SshKey extends Base |
@@ -355,6 +355,9 @@ discard block |
||
355 | 355 | }); |
356 | 356 | } |
357 | 357 | |
358 | + /** |
|
359 | + * @param string $key |
|
360 | + */ |
|
358 | 361 | protected function setConfig($key, $value) |
359 | 362 | { |
360 | 363 | $this->run(function ($kernel) use($key, $value) { |
@@ -362,6 +365,9 @@ discard block |
||
362 | 365 | }); |
363 | 366 | } |
364 | 367 | |
368 | + /** |
|
369 | + * @param \Closure $code |
|
370 | + */ |
|
365 | 371 | private function run($code) |
366 | 372 | { |
367 | 373 | if (null === $this->kernelFactory) { |
@@ -3,19 +3,17 @@ |
||
3 | 3 | namespace Fabrica\QA\Context; |
4 | 4 | |
5 | 5 | use Behat\Behat\Context\BehatContext; |
6 | -use Behat\Behat\Exception\PendingException; |
|
7 | 6 | use Behat\Gherkin\Node\PyStringNode; |
8 | -use Behat\Gherkin\Node\TableNode; |
|
7 | +use Fabrica\Bundle\CoreBundle\EventDispatcher\Event\ProjectEvent; |
|
8 | +use Fabrica\Bundle\CoreBundle\EventDispatcher\FabricaEvents; |
|
9 | 9 | use Fabrica\Models\Code\Email; |
10 | 10 | use Fabrica\Models\Code\Project; |
11 | 11 | use Fabrica\Models\Code\Role; |
12 | 12 | use Fabrica\Models\Code\User; |
13 | 13 | use Fabrica\Models\Code\UserRoleProject; |
14 | 14 | use Fabrica\Models\Code\UserSshKey; |
15 | -use Fabrica\Bundle\CoreBundle\EventDispatcher\Event\ProjectEvent; |
|
16 | -use Fabrica\Bundle\CoreBundle\EventDispatcher\FabricaEvents; |
|
17 | -use Fabrica\Tools\Programs\Git\Admin; |
|
18 | 15 | use Fabrica\QA\KernelFactory; |
16 | +use Fabrica\Tools\Programs\Git\Admin; |
|
19 | 17 | use Symfony\Component\Process\Process; |
20 | 18 | |
21 | 19 | class ApiContext extends BehatContext |
@@ -3,9 +3,9 @@ |
||
3 | 3 | namespace Fabrica\QA; |
4 | 4 | |
5 | 5 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
6 | +use Symfony\Component\Config\FileLocator; |
|
6 | 7 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
7 | 8 | use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; |
8 | -use Symfony\Component\Config\FileLocator; |
|
9 | 9 | |
10 | 10 | use Behat\Behat\Extension\ExtensionInterface; |
11 | 11 |
@@ -47,6 +47,9 @@ |
||
47 | 47 | |
48 | 48 | } |
49 | 49 | |
50 | + /** |
|
51 | + * @param string $realPath |
|
52 | + */ |
|
50 | 53 | public static function readFolderPackages($item, $realPath) |
51 | 54 | { |
52 | 55 | if (in_array($item, ['.', '..'])) { |
@@ -7,14 +7,8 @@ |
||
7 | 7 | |
8 | 8 | use Illuminate\Filesystem\Filesystem; |
9 | 9 | |
10 | -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
|
11 | -use Symfony\Component\Console\Input\InputInterface; |
|
12 | -use Symfony\Component\Console\Input\InputArgument; |
|
13 | -use Symfony\Component\Console\Output\OutputInterface; |
|
14 | - |
|
15 | -use Fabrica\Models\Code\Project; |
|
16 | -use Fabrica\Bundle\CoreBundle\EventDispatcher\FabricaEvents; |
|
17 | 10 | use Fabrica\Bundle\CoreBundle\EventDispatcher\Event\ProjectEvent; |
11 | +use Fabrica\Models\Code\Project; |
|
18 | 12 | |
19 | 13 | /** |
20 | 14 | * |
@@ -335,6 +335,7 @@ |
||
335 | 335 | * Used by this class, and plugins, to execute shell commands. |
336 | 336 | * |
337 | 337 | * @param array ...$params |
338 | + * @param string $params |
|
338 | 339 | * |
339 | 340 | * @return bool |
340 | 341 | */ |
@@ -4,14 +4,14 @@ |
||
4 | 4 | |
5 | 5 | use Fabrica\Helper\BuildInterpolator; |
6 | 6 | use Fabrica\Helper\MailerFactory; |
7 | -use Fabrica\Tools\Logging\BuildLogger; |
|
8 | 7 | use Fabrica\Models\Infra\Ci\Build; |
8 | +use Fabrica\Tools\Logging\BuildLogger; |
|
9 | 9 | use Fabrica\Tools\Plugin\Util\Factory as PluginFactory; |
10 | 10 | use Fabrica\Tools\Store\BuildErrorWriter; |
11 | 11 | use Fabrica\Tools\Store\Factory; |
12 | +use Psr\Log\LogLevel; |
|
12 | 13 | use Psr\Log\LoggerAwareInterface; |
13 | 14 | use Psr\Log\LoggerInterface; |
14 | -use Psr\Log\LogLevel; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * @author Ricardo Sierra <[email protected]> |
@@ -5,8 +5,6 @@ |
||
5 | 5 | |
6 | 6 | namespace Fabrica\Tools\Databases\Mysql; |
7 | 7 | |
8 | -use Fabrica\Tools\Bash; |
|
9 | - |
|
10 | 8 | /** |
11 | 9 | * Explorer Class using Mysqli |
12 | 10 | * |
@@ -123,7 +123,6 @@ |
||
123 | 123 | * Backup the whole database or just some tables |
124 | 124 | * Use '*' for whole database or 'table1 table2 table3...' |
125 | 125 | * |
126 | - * @param string $tables |
|
127 | 126 | */ |
128 | 127 | public function restoreDb() |
129 | 128 | { |