Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace semver/semver by nikolaposa/version #1754

Merged
merged 14 commits into from
Mar 5, 2024
Merged

Replace semver/semver by nikolaposa/version #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
276ea51
Apply fixes from StyleCI
StyleCIBot Dec 25, 2023
8053b82
Merge branch 'nabeelio:dev' into dev
arthurpar06 Jan 15, 2024
3658d3b
Replace semver/semver by nikolaposa/version
arthurpar06 Jan 20, 2024
56b5ae2
Merge branch 'dev' into replaceSemver
arthurpar06 Jan 24, 2024
9b789e6
Update composer.lock
arthurpar06 Jan 24, 2024
5f400f6
Merge branch 'dev' into replaceSemver
arthurpar06 Feb 7, 2024
99f2f31
Update composer.lock
arthurpar06 Feb 7, 2024
b44cceb
Merge branch 'dev' into replaceSemver
arthurpar06 Feb 12, 2024
fa866fa
Merge branch 'dev' into replaceSemver
arthurpar06 Feb 13, 2024
0652fad
Merge branch 'dev' into replaceSemver
arthurpar06 Feb 14, 2024
aeb84e1
Merge branch 'dev' into replaceSemver
arthurpar06 Feb 28, 2024
a9df521
Update composer.lock
arthurpar06 Feb 28, 2024
1ce13eb
Merge branch 'dev' into replaceSemver
nabeelio Feb 29, 2024
1a01ac0
Merge branch 'dev' into replaceSemver
nabeelio Mar 5, 2024
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
4 changes: 2 additions & 2 deletions app/Console/Commands/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ public function handle()

// If a version is being passed in, the update the build, etc data against this
if ($this->argument('version')) {
$version = \SemVer\SemVer\Version::fromString($this->argument('version'));
$version = \Version\Version::fromString($this->argument('version'));
if ($this->option('write-full-version')) {
$cfg['current']['major'] = $version->getMajor();
$cfg['current']['minor'] = $version->getMinor();
$cfg['current']['patch'] = $version->getPatch();
}

$prerelease = $version->getPreRelease();
$prerelease = $version->getPreRelease()?->toString();
if (strpos($prerelease, '.') !== false) {
$prerelease = explode('.', $prerelease);
$cfg['current']['prerelease'] = $prerelease[0];
Expand Down
8 changes: 4 additions & 4 deletions app/Services/VersionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use App\Support\HttpClient;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Support\Facades\Log;
use SemVer\SemVer\Version;
use Symfony\Component\Yaml\Yaml;
use Version\Version;

class VersionService extends Service
{
Expand Down Expand Up @@ -232,8 +232,8 @@ public function isNewVersionAvailable($current_version = null)
*/
public function isGreaterThan($version1, $version2): bool
{
$version1 = Version::fromString($version1);
$version2 = Version::fromString($version2);
return $version1->isGreaterThan($version2);
$parsedVersion1 = Version::fromString($version1);
$parsedVersion2 = Version::fromString($version2);
return $parsedVersion1->isGreaterThan($parsedVersion2);
}
}
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
"phpvms/sample-module": "~1.0",
"prettus/l5-repository": "~2.9.0",
"santigarcor/laratrust": "^8.2.2",
"semver/semver": "~1.1.0",
"spatie/valuestore": "~1.3.2",
"tivie/php-os-detector": "~1.1.0",
"vlucas/phpdotenv": "~5.5",
Expand All @@ -88,7 +87,8 @@
"symfony/postmark-mailer": "^6.0",
"league/html-to-markdown": "^5.1",
"league/flysystem-aws-s3-v3": "^3.0",
"league/flysystem-sftp-v3": "^3.0"
"league/flysystem-sftp-v3": "^3.0",
"nikolaposa/version": "^4.2"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.8.1",
Expand Down
182 changes: 129 additions & 53 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions symfony.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,6 @@
"sempro/phpunit-pretty-print": {
"version": "1.4.0"
},
"semver/semver": {
"version": "1.1.0"
},
"spatie/backtrace": {
"version": "1.2.1"
},
Expand Down
Loading