Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,24 @@
}
],
"require": {
"php": "^8.1",
"php": "^8.3",
"guzzlehttp/guzzle": "^7.2",
"illuminate/contracts": "^10.0|^11.0|^12.0",
"lorisleiva/laravel-actions": "^2.9",
"spatie/laravel-package-tools": "^1.14.0"
"illuminate/contracts": "^12.0|^13.0",
"lorisleiva/laravel-actions": "^2.10",
"spatie/laravel-package-tools": "^1.93"
},
"require-dev": {
"hyperlinkgroup/pint": "^1.0",
"nunomaduro/collision": "^7.8",
"larastan/larastan": "^2.0.1",
"orchestra/testbench": "^8.8",
"pestphp/pest": "^2.20",
"pestphp/pest-plugin-arch": "^2.5",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0"
"larastan/larastan": "^3.0",
"laravel/pao": "^1.1",
"nunomaduro/collision": "^8.9.3",
"orchestra/testbench": "^10.0|^11.0",
"pestphp/pest": "^4.4.3",
"pestphp/pest-plugin-arch": "^4.0",
"pestphp/pest-plugin-laravel": "^4.0",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan-deprecation-rules": "^2.0",
"phpstan/phpstan-phpunit": "^2.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -64,7 +65,6 @@
],
"analyse": "vendor/bin/phpstan analyse",
"test": "vendor/bin/pest",
"test-coverage": "vendor/bin/pest --coverage",
"format": "vendor/bin/pint",
"serve": [
"Composer\\Config::disableProcessTimeout",
Expand All @@ -77,6 +77,9 @@
]
},
"config": {
"platform": {
"php": "8.3"
},
"sort-packages": true,
"allow-plugins": {
"pestphp/pest-plugin": true,
Expand All @@ -93,6 +96,6 @@
}
}
},
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true
}
1 change: 0 additions & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ parameters:
level: 5
paths:
- src
- config
- database
tmpDir: build/phpstan
checkOctaneCompatibility: true
Expand Down
9 changes: 1 addition & 8 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
backupGlobals="false"
Comment thread
kaiserkiwi marked this conversation as resolved.
bootstrap="vendor/autoload.php"
colors="true"
Expand All @@ -20,13 +20,6 @@
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<report>
<html outputDirectory="build/coverage"/>
<text outputFile="build/coverage.txt"/>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
Expand Down
4 changes: 2 additions & 2 deletions src/Actions/CollectLocalTranslations.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private static function translationFileRoots(): array
{
$primary = lang_path();

if (is_string($primary) && $primary !== '' && File::isDirectory($primary)) {
if (filled($primary) && File::isDirectory($primary)) {
return [$primary];
}

Expand Down Expand Up @@ -167,7 +167,7 @@ private static function discoverTranslationFiles(): array
$filenameWithoutExtension = $file->getFilenameWithoutExtension();
$isLinguistFile = strtolower($file->getFilename()) === self::LINGUIST_FILENAME;
$pathSegments = explode(DIRECTORY_SEPARATOR, $relativePath);
$topLevelSegment = $pathSegments[0] ?? '';
$topLevelSegment = $pathSegments[0];

$language = $isLinguistFile
? basename($file->getPath())
Expand Down
2 changes: 1 addition & 1 deletion src/Linguist.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function getLanguages(): Collection

$this->getAllLanguages();

return $this->languages ?? collect();
return $this->languages;
}

public function setLanguages(Collection $languages): self
Expand Down
2 changes: 1 addition & 1 deletion src/Services/SetupOrchestrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function execute(SetupInput $input): SetupResult
);

// Step 6: Trigger auto-translation if requested
if ($input->triggerAutoTranslate && ($syncResult?->overallSuccess ?? false)) {
if ($input->triggerAutoTranslate && $syncResult !== null && $syncResult->overallSuccess) {
$autoTranslate = $this->triggerAutoTranslate(
runtimeClient: $linguistApiClient,
);
Expand Down
Loading