Skip to content

Commit ca1b05b

Browse files
rhuksterrhukster
committed
Merge branch 'develop' into 1.8
Signed-off-by: Andy Miller <[email protected]> # Conflicts: # system/src/Grav/Framework/Collection/AbstractLazyCollection.php
2 parents 350e4c0 + 4097d85 commit ca1b05b

File tree

449 files changed

+450
-450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

449 files changed

+450
-450
lines changed

‎SECURITY.md

+1-1

‎bin/gpm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/**
5-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
5+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
66
* @license MIT License; see LICENSE file for details.
77
*/
88

‎bin/grav

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/**
5-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
5+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
66
* @license MIT License; see LICENSE file for details.
77
*/
88

‎bin/plugin

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/**
5-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
5+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
66
* @license MIT License; see LICENSE file for details.
77
*/
88

‎system/defines.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Core
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/install.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @package Grav\Core
44
*
5-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
5+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
66
* @license MIT License; see LICENSE file for details.
77
*/
88

‎system/router.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Core
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/BaseAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/BlockAssets.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Css.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/InlineCss.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/InlineJs.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/InlineJsModule.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Js.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/JsModule.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Link.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Pipeline.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets\Traits
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets\Traits
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Assets\Traits
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Backup/Backups.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Backup
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Browser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Cache.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Composer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/CompiledBase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/CompiledBlueprints.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/CompiledConfig.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/CompiledLanguages.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/Config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/ConfigFileFinder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/Languages.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Config/Setup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Config
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/Blueprint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/BlueprintSchema.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/Blueprints.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/Data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/DataInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/Validation.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Data/ValidationException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Data
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Debugger.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Errors/BareHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Errors
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Errors/Errors.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Errors
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

‎system/src/Grav/Common/Errors/SimplePageHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @package Grav\Common\Errors
55
*
6-
* @copyright Copyright (c) 2015 - 2024 Trilby Media, LLC. All rights reserved.
6+
* @copyright Copyright (c) 2015 - 2025 Trilby Media, LLC. All rights reserved.
77
* @license MIT License; see LICENSE file for details.
88
*/
99

0 commit comments

Comments
 (0)