Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f4f0b9a
Import intervention/image
daftspunk Jun 28, 2025
29dabb3
Merge branch '4.x' into develop
daftspunk Aug 7, 2025
24fc39b
Merge branch '4.x' into develop
daftspunk Aug 19, 2025
f340082
Refactor resizer to use intervention/image
daftspunk Aug 19, 2025
19e4688
Update ComposerManager.php (#643)
Dheia Sep 6, 2025
25ddda9
Merge branch '4.x' into develop
daftspunk Sep 6, 2025
7325aeb
Merge branch '4.x' into develop
daftspunk Oct 20, 2025
b4b48d7
Formatting, remove combine, stick with assetic
daftspunk Oct 20, 2025
6fbd545
Remove unused files
daftspunk Oct 20, 2025
b8b71f3
Merge branch '4.x' into develop
daftspunk Nov 4, 2025
eea7508
Merge branch '4.x' into develop
daftspunk Nov 20, 2025
e2432eb
Model compatibility with Laravel ValidationException
daftspunk Nov 29, 2025
7bf0222
Fixes setFieldPrefix usage
daftspunk Nov 29, 2025
2129ef7
Implement AjaxExceptionInterface
daftspunk Dec 2, 2025
0721425
Formatting
daftspunk Dec 11, 2025
b87773d
Clean up unused files
daftspunk Dec 11, 2025
dd57699
Fixes return types
daftspunk Dec 11, 2025
1a11083
Fixes tests
daftspunk Dec 13, 2025
1a97728
Fixes backward compatibility
daftspunk Dec 17, 2025
1664423
Merge branch '4.x' into develop
daftspunk Dec 17, 2025
dfb98f7
Vite global
daftspunk Dec 26, 2025
ab55bdb
Target Larajax ^2
daftspunk Dec 30, 2025
27afc46
Update tests to match php 8.5
Samuell1 Dec 31, 2025
a9f4317
Update ModelException.php
Samuell1 Dec 31, 2025
8a26416
Add lazy loading prevention support to Model (#646)
Samuell1 Jan 4, 2026
ebecf6e
Check both October and Laravel
daftspunk Jan 4, 2026
8e78698
Update tests to match php 8.5 (#647)
daftspunk Jan 4, 2026
61b9080
Adds new gateway client
daftspunk Jan 4, 2026
436cf8f
Bump version
daftspunk Jan 4, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
max-parallel: 6
matrix:
phpVersions: ['8.2', '8.3', '8.4']
phpVersions: ['8.2', '8.3', '8.4', '8.5']
fail-fast: false
name: PHP ${{ matrix.phpVersions }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ composer.lock
# Editor files
.idea
.vscode
.claude

# Other files
.DS_Store
php_errors.log
.phpunit.result.cache
.phpunit.result.cache
9 changes: 8 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"php": "^8.0.2",
"composer/composer": "^2.0.0",
"composer/installers": "^1 || ^2",
"larajax/larajax": "^2.0",
"doctrine/dbal": "^2.13.3|^3.1.4",
"intervention/image": "^3.10",
"jaybizzle/crawler-detect": "^1.3",
"linkorb/jsmin-php": "~1.0",
"wikimedia/less.php": "~5.2",
Expand Down Expand Up @@ -66,5 +68,10 @@
}
},
"minimum-stability": "dev",
"prefer-stable": true
"prefer-stable": true,
"config": {
"allow-plugins": {
"composer/installers": true
}
}
}
8 changes: 8 additions & 0 deletions globals/Vite.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

/**
* Vite
*
* @see \Illuminate\Foundation\Vite
*/
class Vite extends Illuminate\Support\Facades\Vite {}
38 changes: 19 additions & 19 deletions src/Assetic/Asset/AssetCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
class AssetCache implements AssetInterface
{
/**
* @var mixed asset
* @var AssetInterface asset
*/
protected $asset;

/**
* @var mixed cache
* @var CacheInterface cache
*/
protected $cache;

Expand All @@ -33,31 +33,31 @@ public function __construct(AssetInterface $asset, CacheInterface $cache)
/**
* ensureFilter
*/
public function ensureFilter(FilterInterface $filter)
public function ensureFilter(FilterInterface $filter): void
{
$this->asset->ensureFilter($filter);
}

/**
* getFilters
*/
public function getFilters()
public function getFilters(): array
{
return $this->asset->getFilters();
}

/**
* clearFilters
*/
public function clearFilters()
public function clearFilters(): void
{
$this->asset->clearFilters();
}

/**
* load
*/
public function load(?FilterInterface $additionalFilter = null)
public function load(?FilterInterface $additionalFilter = null): void
{
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
if ($this->cache->has($cacheKey)) {
Expand All @@ -73,7 +73,7 @@ public function load(?FilterInterface $additionalFilter = null)
/**
* dump
*/
public function dump(?FilterInterface $additionalFilter = null)
public function dump(?FilterInterface $additionalFilter = null): string
{
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'dump');
if ($this->cache->has($cacheKey)) {
Expand All @@ -89,87 +89,87 @@ public function dump(?FilterInterface $additionalFilter = null)
/**
* getContent
*/
public function getContent()
public function getContent(): ?string
{
return $this->asset->getContent();
}

/**
* setContent
*/
public function setContent($content)
public function setContent(?string $content): void
{
$this->asset->setContent($content);
}

/**
* getSourceRoot
*/
public function getSourceRoot()
public function getSourceRoot(): ?string
{
return $this->asset->getSourceRoot();
}

/**
* getSourcePath
*/
public function getSourcePath()
public function getSourcePath(): ?string
{
return $this->asset->getSourcePath();
}

/**
* getSourceDirectory
*/
public function getSourceDirectory()
public function getSourceDirectory(): ?string
{
return $this->asset->getSourceDirectory();
}

/**
* getTargetPath
*/
public function getTargetPath()
public function getTargetPath(): ?string
{
return $this->asset->getTargetPath();
}

/**
* setTargetPath
*/
public function setTargetPath($targetPath)
public function setTargetPath(?string $targetPath): void
{
$this->asset->setTargetPath($targetPath);
}

/**
* getLastModified
*/
public function getLastModified()
public function getLastModified(): ?int
{
return $this->asset->getLastModified();
}

/**
* getVars
*/
public function getVars()
public function getVars(): array
{
return $this->asset->getVars();
}

/**
* setValues
*/
public function setValues(array $values)
public function setValues(array $values): void
{
$this->asset->setValues($values);
}

/**
* getValues
*/
public function getValues()
public function getValues(): array
{
return $this->asset->getValues();
}
Expand All @@ -190,7 +190,7 @@ public function getValues()
*
* @return string A key for identifying the current asset
*/
protected static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, $salt = '')
protected static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, string $salt = ''): string
{
if ($additionalFilter) {
$asset = clone $asset;
Expand Down
Loading