Merge branch '4.4' into 5.2
* 4.4: [gha] Define COLUMNS properly [travis] keep compiling sodium
This commit is contained in:
commit
08c27ede89
|
@ -61,6 +61,7 @@ jobs:
|
||||||
COMPOSER_HOME="$(composer config home)"
|
COMPOSER_HOME="$(composer config home)"
|
||||||
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
|
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
|
||||||
|
|
||||||
|
echo COLUMNS=120 >> $GITHUB_ENV
|
||||||
echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
|
echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
|
||||||
echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
|
echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
|
||||||
|
|
||||||
|
@ -149,7 +150,6 @@ jobs:
|
||||||
local ok=0
|
local ok=0
|
||||||
local title="$1 $FLIP"
|
local title="$1 $FLIP"
|
||||||
local start=$(date -u +%s)
|
local start=$(date -u +%s)
|
||||||
export COLUMNS=120
|
|
||||||
OUTPUT=$(bash -xc "$2" 2>&1) || ok=1
|
OUTPUT=$(bash -xc "$2" 2>&1) || ok=1
|
||||||
local end=$(date -u +%s)
|
local end=$(date -u +%s)
|
||||||
|
|
||||||
|
|
|
@ -18,15 +18,17 @@ use Symfony\Component\Routing\Route;
|
||||||
class TextDescriptorTest extends AbstractDescriptorTest
|
class TextDescriptorTest extends AbstractDescriptorTest
|
||||||
{
|
{
|
||||||
private $fileLinkFormatter = null;
|
private $fileLinkFormatter = null;
|
||||||
|
private $colSize;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS=121');
|
$this->colSize = getenv('COLUMNS');
|
||||||
|
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown(): void
|
protected function tearDown(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS');
|
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getDescriptor()
|
protected function getDescriptor()
|
||||||
|
|
|
@ -29,6 +29,18 @@ class UserPasswordEncoderCommandTest extends AbstractWebTestCase
|
||||||
{
|
{
|
||||||
/** @var CommandTester */
|
/** @var CommandTester */
|
||||||
private $passwordEncoderCommandTester;
|
private $passwordEncoderCommandTester;
|
||||||
|
private $colSize;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$this->colSize = getenv('COLUMNS');
|
||||||
|
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function tearDown(): void
|
||||||
|
{
|
||||||
|
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
|
||||||
|
}
|
||||||
|
|
||||||
public function testEncodePasswordEmptySalt()
|
public function testEncodePasswordEmptySalt()
|
||||||
{
|
{
|
||||||
|
@ -314,7 +326,6 @@ EOTXT
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
|
||||||
$kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
|
$kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
|
@ -332,7 +343,6 @@ EOTXT
|
||||||
|
|
||||||
private function setupArgon2i()
|
private function setupArgon2i()
|
||||||
{
|
{
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
|
||||||
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
|
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
|
@ -345,7 +355,6 @@ EOTXT
|
||||||
|
|
||||||
private function setupArgon2id()
|
private function setupArgon2id()
|
||||||
{
|
{
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
|
||||||
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2id.yml']);
|
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2id.yml']);
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
|
@ -358,7 +367,6 @@ EOTXT
|
||||||
|
|
||||||
private function setupBcrypt()
|
private function setupBcrypt()
|
||||||
{
|
{
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
|
||||||
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'bcrypt.yml']);
|
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'bcrypt.yml']);
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
|
@ -371,7 +379,6 @@ EOTXT
|
||||||
|
|
||||||
private function setupSodium()
|
private function setupSodium()
|
||||||
{
|
{
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
|
||||||
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'sodium.yml']);
|
$kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'sodium.yml']);
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
|
|
|
@ -15,14 +15,17 @@ use Symfony\Component\Form\Console\Descriptor\JsonDescriptor;
|
||||||
|
|
||||||
class JsonDescriptorTest extends AbstractDescriptorTest
|
class JsonDescriptorTest extends AbstractDescriptorTest
|
||||||
{
|
{
|
||||||
|
private $colSize;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS=121');
|
$this->colSize = getenv('COLUMNS');
|
||||||
|
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown(): void
|
protected function tearDown(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS');
|
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getDescriptor()
|
protected function getDescriptor()
|
||||||
|
|
|
@ -15,14 +15,17 @@ use Symfony\Component\Form\Console\Descriptor\TextDescriptor;
|
||||||
|
|
||||||
class TextDescriptorTest extends AbstractDescriptorTest
|
class TextDescriptorTest extends AbstractDescriptorTest
|
||||||
{
|
{
|
||||||
|
private $colSize;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS=121');
|
$this->colSize = getenv('COLUMNS');
|
||||||
|
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown(): void
|
protected function tearDown(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS');
|
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getDescriptor()
|
protected function getDescriptor()
|
||||||
|
|
|
@ -29,14 +29,17 @@ use Symfony\Component\Messenger\Tests\Fixtures\MultipleBusesMessageHandler;
|
||||||
*/
|
*/
|
||||||
class DebugCommandTest extends TestCase
|
class DebugCommandTest extends TestCase
|
||||||
{
|
{
|
||||||
|
private $colSize;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
|
$this->colSize = getenv('COLUMNS');
|
||||||
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown(): void
|
protected function tearDown(): void
|
||||||
{
|
{
|
||||||
putenv('COLUMNS');
|
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testOutput()
|
public function testOutput()
|
||||||
|
|
Reference in New Issue