1
0
Fork 0
mirror of https://github.com/archtechx/gloss.git synced 2025-12-12 11:14:04 +00:00

Support Laravel 9 (#3)

* wip

* Update composer.json

* Update composer.json

Co-authored-by: Samuel Štancl <samuel.stancl@gmail.com>

* Update composer.json

Co-authored-by: Samuel Štancl <samuel.stancl@gmail.com>

* Update ci.yml

* Update composer.json

* wip

* wip

* Update ci.yml

* typehint -> type

* Update phpstan.neon

* Update composer.json

* Update composer.json

* wip

* Update composer.json

* Update composer.json

* Update composer.json

Co-authored-by: Samuel Štancl <samuel.stancl@gmail.com>
This commit is contained in:
Abrar Ahmad 2022-01-27 22:10:10 +05:00 committed by GitHub
parent 1b1eca87c8
commit 263e0aa1cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 98 additions and 56 deletions

View file

@ -23,8 +23,6 @@ class GlossTranslator extends Translator
/**
* Register an override that returns a different key name.
*
* @param string $shortKey
* @param string $newKey
* @param array|null|callable $condition
* @return void
*/
@ -45,8 +43,6 @@ class GlossTranslator extends Translator
/**
* Register an override that returns a value.
*
* @param string $shortKey
* @param string $value
* @param array|null|callable $condition
* @return void
*/
@ -67,7 +63,6 @@ class GlossTranslator extends Translator
/**
* Register multiple value overrides.
*
* @param array $values
* @param array|null|callable $condition
* @return void
*/
@ -82,8 +77,6 @@ class GlossTranslator extends Translator
/**
* Customize a translation string's value using a callback.
*
* @param string $shortKey
* @param callable $value
* @return void
*/
public function extend(string $shortKey, callable $value)
@ -95,7 +88,6 @@ class GlossTranslator extends Translator
* Get a translation string.
*
* @param string $key
* @param array $replace
* @param string|null $locale
* @param bool $fallback
* @return string
@ -132,7 +124,6 @@ class GlossTranslator extends Translator
/**
* Get a translation string and skip extensions.
*
* @param string $key
* @param array $replace
* @param string|null $locale
* @param bool $fallback
@ -203,7 +194,9 @@ class GlossTranslator extends Translator
protected function choiceWithoutExtensions($key, $number, array $replace = [], $locale = null)
{
$line = $this->getWithoutExtensions(
$key, $replace, $locale = $this->localeForChoice($locale)
$key,
$replace,
$locale = $this->localeForChoice($locale)
);
// If the given "number" is actually an array or countable we will simply count the
@ -216,7 +209,8 @@ class GlossTranslator extends Translator
$replace['count'] = $number;
return $this->makeReplacements(
$this->getSelector()->choose($line, $number, $locale), $replace
$this->getSelector()->choose($line, $number, $locale),
$replace
);
}
@ -252,7 +246,6 @@ class GlossTranslator extends Translator
/**
* @param string|callable $line
* @param array $replace
* @return string
*/
protected function makeReplacements($line, array $replace)

View file

@ -10,7 +10,6 @@ if (! function_exists('gloss')) {
*
* @param string|array|null $key
* @param array|callable|null $replace
* @param string|null $locale
* @return void|string|null|\Lean\Gloss\GlossTranslator
*/
function gloss($key = null, $replace = null, string $locale = null)
@ -36,8 +35,6 @@ if (! function_exists('___') && Gloss::$underscoreHelper) {
* Resolve a translation string or Gloss instance.
*
* @param string|array|null $key
* @param array $replace
* @param string|null $locale
* @return void|string|null|\Lean\Gloss\GlossTranslator
*/
function ___($key = null, array $replace = [], string $locale = null)