Merge pull request #6004 from nexxai/master

This commit is contained in:
Jérémy Benoist 2022-10-04 08:12:26 +02:00 committed by GitHub
commit 639bba031f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions

View file

@ -346,7 +346,7 @@ class ContentProxy
* parse_url arrays. * parse_url arrays.
* *
* As array_diff_assoc only computes changes to go from the left array * As array_diff_assoc only computes changes to go from the left array
* to the right one, we make two differents arrays to have both * to the right one, we make two different arrays to have both
* directions. We merge these two arrays and sort keys before passing * directions. We merge these two arrays and sort keys before passing
* the result to the switch. * the result to the switch.
* *

View file

@ -33,7 +33,7 @@ class CryptoProxy
/** /**
* Ensure the given value will be crypted. * Ensure the given value will be crypted.
* *
* @param string $secretValue Secret valye to crypt * @param string $secretValue Secret value to crypt
* *
* @return string * @return string
*/ */

View file

@ -10,7 +10,7 @@ use Wallabag\UserBundle\Entity\User;
* This class intend to detect the active theme for the logged in user. * This class intend to detect the active theme for the logged in user.
* It will retrieve the configured theme of the user. * It will retrieve the configured theme of the user.
* *
* If no user where logged in, it will returne the default theme * If no user where logged in, it will return the default theme
*/ */
class DetectActiveTheme implements DeviceDetectionInterface class DetectActiveTheme implements DeviceDetectionInterface
{ {

View file

@ -167,7 +167,7 @@ class EntriesExport
$book->setAuthor($this->author, $this->author); $book->setAuthor($this->author, $this->author);
// I hope this is a non existant address :) // I hope this is a non-existent address :)
$book->setPublisher('wallabag', 'wallabag'); $book->setPublisher('wallabag', 'wallabag');
// Strictly not needed as the book date defaults to time(). // Strictly not needed as the book date defaults to time().
$book->setDate(time()); $book->setDate(time());

View file

@ -242,7 +242,7 @@ class EntryRepository extends EntityRepository
$entryAlias = 'e' . $i; $entryAlias = 'e' . $i;
$tagAlias = 't' . $i; $tagAlias = 't' . $i;
// Complexe queries to ensure multiple tags are associated to an entry // Complex queries to ensure multiple tags are associated to an entry
// https://stackoverflow.com/a/6638146/569101 // https://stackoverflow.com/a/6638146/569101
$qb->andWhere($qb->expr()->in( $qb->andWhere($qb->expr()->in(
'e.id', 'e.id',

View file

@ -18,7 +18,7 @@ class RedisWorkerCommand extends ContainerAwareCommand
->setName('wallabag:import:redis-worker') ->setName('wallabag:import:redis-worker')
->setDescription('Launch Redis worker') ->setDescription('Launch Redis worker')
->addArgument('serviceName', InputArgument::REQUIRED, 'Service to use: wallabag_v1, wallabag_v2, pocket, readability, pinboard, delicious, firefox, chrome or instapaper') ->addArgument('serviceName', InputArgument::REQUIRED, 'Service to use: wallabag_v1, wallabag_v2, pocket, readability, pinboard, delicious, firefox, chrome or instapaper')
->addOption('maxIterations', '', InputOption::VALUE_OPTIONAL, 'Number of iterations before stoping', false) ->addOption('maxIterations', '', InputOption::VALUE_OPTIONAL, 'Number of iterations before stopping', false)
; ;
} }

View file

@ -202,7 +202,7 @@ class DownloadImagesTest extends TestCase
$this->assertFalse($res); $this->assertFalse($res);
} }
public function testEnsureOnlyFirstOccurenceIsReplaced() public function testEnsureOnlyFirstOccurrenceIsReplaced()
{ {
$httpMockClient = new HttpMockClient(); $httpMockClient = new HttpMockClient();
$httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))); $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));