Skip to content

Commit 9af1110

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 4c4b15b + a096e74 commit 9af1110

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ before_install:
1818
- sudo mysql -u root -e "CREATE DATABASE IF NOT EXISTS \`database\`;"
1919
- sudo mysql -u root -e "CREATE USER 'username'@'localhost' IDENTIFIED BY 'password';"
2020
- sudo mysql -u root -e "GRANT ALL ON *.* TO 'username'@'localhost'; FLUSH PRIVILEGES;"
21-
- sudo mysql -u root -e "USE mysql; UPDATE user SET password=PASSWORD('root') WHERE user='root'; FLUSH PRIVILEGES;"
21+
- sudo mysql -u root -e "USE mysql; UPDATE user SET password=PASSWORD('secret') WHERE user='root'; FLUSH PRIVILEGES;"
2222
- sudo service mysql restart
2323
- sudo apt-get update
2424

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
theme: jekyll-theme-hacker

src/MysqlImport.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ class MysqlImport
7070
protected $exitCode;
7171

7272
/**
73-
* @var boolean
73+
* @var bool
7474
*/
7575
protected $doWhile;
7676

7777
/**
78-
* @var boolean
78+
* @var bool
7979
*/
8080
protected $force;
8181

@@ -146,6 +146,7 @@ public function __construct($env, $argv)
146146
//
147147
if (in_array('--no-file', $argv)) {
148148
$this->file = false;
149+
149150
return;
150151
}
151152

@@ -442,7 +443,9 @@ public function getInfo()
442443
* @param $done
443444
* @param $total
444445
* @param string $info
445-
* @param int $width
446+
* @param int $width
447+
* @param mixed $second
448+
*
446449
* @return string
447450
*/
448451
public function waiting($second = 10)
@@ -451,7 +454,7 @@ public function waiting($second = 10)
451454
for ($i = 0; $i < $second * $freq; $i++) {
452455
echo $text = '['.substr($this->loader, 0, -1).'] waiting... ';
453456
usleep(1000000 / $freq);
454-
$this->loader = substr($this->loader, -1) . substr($this->loader, 0, -1);
457+
$this->loader = substr($this->loader, -1).substr($this->loader, 0, -1);
455458
echo str_repeat("\010", strlen($text));
456459
}
457460
}

0 commit comments

Comments
 (0)