Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#6874 from samsonasik/f…
Browse files Browse the repository at this point in the history
…ix-cs-dev

Fixes CS on latest develop as php-cs-fixer updated to 1.*
  • Loading branch information
Ocramius committed Nov 14, 2014
3 parents 3eeb525 + 8db1d06 + 92d6fce commit 2f886b6
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/FileCipherTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public function testSetCipherAlgorithmFail()
$this->setExpectedException('Zend\Crypt\Symmetric\Exception\InvalidArgumentException',
'The algorithm unknown is not supported by Zend\Crypt\Symmetric\Mcrypt');
$this->fileCipher->setCipherAlgorithm('unknown');

}

public function testGetCipherSupportedAlgorithms()
Expand All @@ -116,9 +115,9 @@ public function testSetHashAlgorithm()

public function testSetWrongHashAlgorithm()
{
$this->setExpectedException('Zend\Crypt\Exception\InvalidArgumentException',
$this->setExpectedException('Zend\Crypt\Exception\InvalidArgumentException',
'The specified hash algorithm \'unknown\' is not supported by Zend\Crypt\Hash');
$this->fileCipher->setHashAlgorithm('unknown');
$this->fileCipher->setHashAlgorithm('unknown');
}

public function testSetPbkdf2HashAlgorithm()
Expand Down

0 comments on commit 2f886b6

Please sign in to comment.