Skip to content

Commit 0607e7e

Browse files
redthorredthor
authored
Merge pull request #37 from redthor/fix/cleanup-scrutinizer-issues
Fix/cleanup scrutinizer issues
2 parents 7ef62d6 + cc4367e commit 0607e7e

11 files changed

Lines changed: 62 additions & 62 deletions

File tree

‎src/AntiMattr/MongoDB/Migrations/AbstractMigration.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
abstract class AbstractMigration
2424
{
2525
/**
26-
* @var AntiMattr\MongoDB\Migrations\Configuration\Configuration
26+
* @var \AntiMattr\MongoDB\Migrations\Configuration\Configuration
2727
*/
2828
private $configuration;
2929

3030
/**
31-
* @var AntiMattr\MongoDB\Migrations\OutputWriter
31+
* @var \AntiMattr\MongoDB\Migrations\OutputWriter
3232
*/
3333
private $outputWriter;
3434

3535
/**
36-
* @var AntiMattr\MongoDB\Migrations\Version
36+
* @var \AntiMattr\MongoDB\Migrations\Version
3737
*/
3838
protected $version;
3939

@@ -56,15 +56,15 @@ abstract public function up(Database $db);
5656
abstract public function down(Database $db);
5757

5858
/**
59-
* @param Doctrine\MongoDB\Collection
59+
* @param \Doctrine\MongoDB\Collection
6060
*/
6161
protected function analyze(Collection $collection)
6262
{
6363
$this->version->analyze($collection);
6464
}
6565

6666
/**
67-
* @param Doctrine\MongoDB\Database
67+
* @param \Doctrine\MongoDB\Database
6868
* @param string $filename
6969
*/
7070
protected function executeScript(Database $db, $filename)

‎src/AntiMattr/MongoDB/Migrations/Collection/Statistics.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Statistics
4242
];
4343

4444
/**
45-
* @var Doctrine\MongoDB\Collection
45+
* @var \Doctrine\MongoDB\Collection
4646
*/
4747
private $collection;
4848

@@ -57,15 +57,15 @@ class Statistics
5757
private $after = [];
5858

5959
/**
60-
* @param Doctrine\MongoDB\Collection
60+
* @param \Doctrine\MongoDB\Collection
6161
*/
6262
public function setCollection(Collection $collection)
6363
{
6464
$this->collection = $collection;
6565
}
6666

6767
/**
68-
* @return Doctrine\MongoDB\Collection
68+
* @return \Doctrine\MongoDB\Collection
6969
*/
7070
public function getCollection()
7171
{

‎src/AntiMattr/MongoDB/Migrations/Configuration/Configuration.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
class Configuration
2626
{
2727
/**
28-
* @var Doctrine\MongoDB\Collection
28+
* @var \Doctrine\MongoDB\Collection
2929
*/
3030
private $collection;
3131

3232
/**
33-
* @var Doctrine\MongoDB\Connection
33+
* @var \Doctrine\MongoDB\Connection
3434
*/
3535
private $connection;
3636

3737
/**
38-
* @var Doctrine\MongoDB\Database
38+
* @var \Doctrine\MongoDB\Database
3939
*/
4040
private $database;
4141

4242
/**
43-
* @var Doctrine\MongoDB\Connection
43+
* @var \Doctrine\MongoDB\Connection
4444
*/
4545
private $migrationsDatabase;
4646

@@ -94,18 +94,18 @@ class Configuration
9494
private $name;
9595

9696
/**
97-
* @var AntiMattr\MongoDB\Migrations\Version[]
97+
* @var \AntiMattr\MongoDB\Migrations\Version[]
9898
*/
9999
protected $migrations = [];
100100

101101
/**
102-
* @var AntiMattr\MongoDB\Migrations\OutputWriter
102+
* @var \AntiMattr\MongoDB\Migrations\OutputWriter
103103
*/
104104
private $outputWriter;
105105

106106
/**
107-
* @param Doctrine\MongoDB\Connection $connection
108-
* @param AntiMattr\MongoDB\Migrations\OutputWriter $outputWriter
107+
* @param \Doctrine\MongoDB\Connection $connection
108+
* @param \AntiMattr\MongoDB\Migrations\OutputWriter $outputWriter
109109
*/
110110
public function __construct(Connection $connection, OutputWriter $outputWriter = null)
111111
{
@@ -151,7 +151,7 @@ public function getAvailableVersions()
151151
}
152152

153153
/**
154-
* @return Doctrine\MongoDB\Collection
154+
* @return \Doctrine\MongoDB\Collection
155155
*/
156156
public function getCollection()
157157
{
@@ -165,15 +165,15 @@ public function getCollection()
165165
}
166166

167167
/**
168-
* @return Doctrine\MongoDB\Connection
168+
* @return \Doctrine\MongoDB\Connection
169169
*/
170170
public function getConnection()
171171
{
172172
return $this->connection;
173173
}
174174

175175
/**
176-
* @return Doctrine\MongoDB\Database
176+
* @return \Doctrine\MongoDB\Database
177177
*/
178178
public function getDatabase(): ?Database
179179
{
@@ -281,7 +281,7 @@ public function getMigrationsScriptDirectory()
281281
/**
282282
* Returns all migrated versions from the versions collection, in an array.
283283
*
284-
* @return AntiMattr\MongoDB\Migrations\Version[]
284+
* @return \AntiMattr\MongoDB\Migrations\Version[]
285285
*/
286286
public function getMigratedVersions()
287287
{
@@ -301,12 +301,12 @@ public function getMigratedVersions()
301301
*
302302
* @param string $version
303303
*
304-
* @return string
304+
* @return int
305305
*
306306
* @throws AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException Throws exception if migration version does not exist
307307
* @throws DomainException If more than one version exists
308308
*/
309-
public function getMigratedTimestamp($version)
309+
public function getMigratedTimestamp($version): int
310310
{
311311
$this->createMigrationCollection();
312312

@@ -329,7 +329,7 @@ public function getMigratedTimestamp($version)
329329
// Convert to normalised timestamp
330330
$ts = new Timestamp($returnVersion['t']);
331331

332-
return (string) $ts;
332+
return $ts->getTimestamp();
333333
}
334334

335335
/**
@@ -379,7 +379,7 @@ public function getNumberOfExecutedMigrations()
379379
}
380380

381381
/**
382-
* @return AntiMattr\MongoDB\Migrations\OutputWriter
382+
* @return \AntiMattr\MongoDB\Migrations\OutputWriter
383383
*/
384384
public function getOutputWriter()
385385
{
@@ -468,7 +468,7 @@ public function registerMigrationsFromDirectory($path)
468468
*
469469
* @param string $version The version string in the format YYYYMMDDHHMMSS
470470
*
471-
* @return AntiMattr\MongoDB\Migrations\Version
471+
* @return \AntiMattr\MongoDB\Migrations\Version
472472
*
473473
* @throws AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException Throws exception if migration version does not exist
474474
*/
@@ -496,7 +496,7 @@ public function hasVersion($version)
496496
/**
497497
* Check if a version has been migrated or not yet.
498498
*
499-
* @param AntiMattr\MongoDB\Migrations\Version $version
499+
* @param \AntiMattr\MongoDB\Migrations\Version $version
500500
*
501501
* @return bool
502502
*/
@@ -517,7 +517,7 @@ public function getCurrentVersion()
517517
$this->createMigrationCollection();
518518

519519
$migratedVersions = [];
520-
if ($this->migrations) {
520+
if (!empty($this->migrations)) {
521521
foreach ($this->migrations as $migration) {
522522
$migratedVersions[] = $migration->getVersion();
523523
}

‎src/AntiMattr/MongoDB/Migrations/Migration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function migrate($to = null)
8181

8282
$time = 0;
8383
foreach ($migrationsToExecute as $version) {
84-
$versionSql = $version->execute($direction);
84+
$version->execute($direction);
8585
$time += $version->getTime();
8686
}
8787

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/AbstractCommand.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
abstract class AbstractCommand extends Command
2626
{
2727
/**
28-
* @var AntiMattr\MongoDB\Migrations\Configuration\Configuration
28+
* @var \AntiMattr\MongoDB\Migrations\Configuration\Configuration
2929
*/
3030
private $configuration;
3131

@@ -43,8 +43,8 @@ protected function configure()
4343
}
4444

4545
/**
46-
* @param AntiMattr\MongoDB\Migrations\Configuration\Configuration
47-
* @param Symfony\Component\Console\Output\OutputInterface
46+
* @param \AntiMattr\MongoDB\Migrations\Configuration\Configuration $configuration
47+
* @param \Symfony\Component\Console\Output\OutputInterface $output
4848
*/
4949
protected function outputHeader(Configuration $configuration, OutputInterface $output)
5050
{
@@ -58,18 +58,18 @@ protected function outputHeader(Configuration $configuration, OutputInterface $o
5858
}
5959

6060
/**
61-
* @param AntiMattr\MongoDB\Migrations\Configuration\Configuration
61+
* @param \AntiMattr\MongoDB\Migrations\Configuration\Configuration
6262
*/
6363
public function setMigrationConfiguration(Configuration $config)
6464
{
6565
$this->configuration = $config;
6666
}
6767

6868
/**
69-
* @param Symfony\Component\Console\Output\InputInterface $input
70-
* @param Symfony\Component\Console\Output\OutputInterface $output
69+
* @param \Symfony\Component\Console\Input\InputInterface $input
70+
* @param \Symfony\Component\Console\Output\OutputInterface $output
7171
*
72-
* @return AntiMattr\MongoDB\Migrations\Configuration\Configuration
72+
* @return \AntiMattr\MongoDB\Migrations\Configuration\Configuration
7373
*/
7474
protected function getMigrationConfiguration(InputInterface $input, OutputInterface $output)
7575
{
@@ -112,9 +112,9 @@ protected function getMigrationConfiguration(InputInterface $input, OutputInterf
112112
}
113113

114114
/**
115-
* @params array $params
115+
* @param array $params
116116
*
117-
* @return Doctrine\MongoDB\Connection
117+
* @return \Doctrine\MongoDB\Connection
118118
*/
119119
protected function createConnection($params)
120120
{

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/ExecuteCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ protected function configure()
5353
}
5454

5555
/**
56-
* @param Symfony\Component\Console\Input\InputInterface
57-
* @param Symfony\Component\Console\Output\OutputInterface
56+
* @param \Symfony\Component\Console\Input\InputInterface
57+
* @param \Symfony\Component\Console\Output\OutputInterface
5858
*/
5959
public function execute(InputInterface $input, OutputInterface $output)
6060
{

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/GenerateCommand.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ protected function configure()
7979
}
8080

8181
/**
82-
* @param Symfony\Component\Console\Input\InputInterface
83-
* @param Symfony\Component\Console\Output\OutputInterface
82+
* @param \Symfony\Component\Console\Input\InputInterface
83+
* @param \Symfony\Component\Console\Output\OutputInterface
8484
*/
8585
public function execute(InputInterface $input, OutputInterface $output)
8686
{
@@ -93,8 +93,8 @@ public function execute(InputInterface $input, OutputInterface $output)
9393
}
9494

9595
/**
96-
* @param AntiMattr\MongoDB\Migrations\Configuration\Configuration
97-
* @param Symfony\Component\Console\Input\InputInterface
96+
* @param \AntiMattr\MongoDB\Migrations\Configuration\Configuration
97+
* @param \Symfony\Component\Console\Input\InputInterface
9898
* @param string $version
9999
* @param string $up
100100
* @param string $down

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/MigrateCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ protected function configure()
5151
}
5252

5353
/**
54-
* @param Symfony\Component\Console\Input\InputInterface
55-
* @param Symfony\Component\Console\Output\OutputInterface
54+
* @param \Symfony\Component\Console\Input\InputInterface
55+
* @param \Symfony\Component\Console\Output\OutputInterface
5656
*/
5757
public function execute(InputInterface $input, OutputInterface $output)
5858
{

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/StatusCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ protected function configure()
5252
}
5353

5454
/**
55-
* @param Symfony\Component\Console\Input\InputInterface
56-
* @param Symfony\Component\Console\Output\OutputInterface
55+
* @param \Symfony\Component\Console\Input\InputInterface
56+
* @param \Symfony\Component\Console\Output\OutputInterface
5757
*/
5858
public function execute(InputInterface $input, OutputInterface $output)
5959
{
@@ -146,7 +146,7 @@ public function execute(InputInterface $input, OutputInterface $output)
146146
}
147147

148148
$executedUnavailableMigrations = $configuration->getUnavailableMigratedVersions();
149-
if ($executedUnavailableMigrations) {
149+
if (!empty($executedUnavailableMigrations)) {
150150
$output->writeln("\n <info>==</info> Previously Executed Unavailable Migration Versions\n");
151151
foreach ($executedUnavailableMigrations as $executedUnavailableMigration) {
152152
$output->writeln(

‎src/AntiMattr/MongoDB/Migrations/Tools/Console/Command/VersionCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ protected function configure()
4949
}
5050

5151
/**
52-
* @param Symfony\Component\Console\Input\InputInterface
53-
* @param Symfony\Component\Console\Output\OutputInterface
52+
* @param \Symfony\Component\Console\Input\InputInterface
53+
* @param \Symfony\Component\Console\Output\OutputInterface
5454
*
5555
* @throws AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException Throws exception if migration version does not exist
5656
* @throws InvalidArgumentException

0 commit comments

Comments
 (0)