chore(deps): update dependency friendsofphp/php-cs-fixer to <3.85.2 (#3188)
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [friendsofphp/php-cs-fixer](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer) | `<3.64.1` -> `<3.85.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>PHP-CS-Fixer/PHP-CS-Fixer (friendsofphp/php-cs-fixer)</summary> ### [`v3.85.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3851) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.85.0...v3.85.1) - chore: update legacy deps ([#​8902](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8902)) ### [`v3.85.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3850) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.84.0...v3.85.0) - feat: `ArrayIndentationFixer` - handle closures inside attributes ([#​8888](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8888)) - feat: `NullableTypeDeclarationFixer` - support final promoted properties ([#​8885](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8885)) - feat: `OperatorLinebreakFixer` - support pipe operator ([#​8891](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8891)) - feat: `PhpdocTypesFixer` - support multiline array shapes ([#​8893](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8893)) - fix: always reach 100% of checked files ([#​8861](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8861)) - fix: `BracesPositionFixer` - handle property hooks correctly ([#​8886](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8886)) - fix: `NullableTypeDeclarationFixer` - handle abstract and final properties ([#​8876](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8876)) - fix: `PhpdocLineSpanFixer` - handle promoted properties ([#​8897](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8897)) - fix: `PhpUnitDataProviderNameFixer` - fix for multiple providers defined by attributes for one test method ([#​8849](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8849)) - fix: `TernaryOperatorSpacesFixer` - handle `instanceof static` ([#​8879](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8879)) - fix: `TypeDeclarationSpacesFixer` - handle asymmetric visibility and final properties ([#​8900](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8900)) - chore: add initial PHP 8.5 integration test ([#​8871](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8871)) - chore: add tests for public API methods ([#​8895](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8895)) - chore: apply changes from `PhpdocTypesFixer` for multiline array shapes ([#​8894](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8894)) - chore: baseline files without error count ([#​8870](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8870)) - chore: cleanup `PhpCsFixer\DocBlock\Annotation` ([#​8892](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8892)) - chore: Command name/descriptions - use attribute and static properties ([#​8862](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8862)) - chore: Commands - unify way to define help content ([#​8881](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8881)) - chore: ConfigurationResolver - add few missing v4 TODOs ([#​8882](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8882)) - chore: fix `booleanNot.exprNotBoolean` errors ([#​8869](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8869)) - chore: fix/optimize some phpdocs ([#​8889](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8889)) - chore: more unification of PHP CS Fixer naming ([#​8854](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8854)) - chore: PHPStan baseline - use `shipmonk/phpstan-baseline-per-identifier` ([#​8844](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8844)) - chore: remove dead code ([#​8896](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8896)) - chore: remove unused constants ([#​8864](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8864)) - chore: remove useless `@var` annotations ([#​8867](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8867)) - chore: simplify `ClassDefinitionFixer` ([#​8868](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8868)) - chore: unify usage of image versions to not mention minor ([#​8860](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8860)) - chore: update PHPStan ([#​8898](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8898)) - chore: update PHPStan extension for `Preg::match` ([#​8872](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8872)) - chore: wrong return values in `ErrorsManager` ([#​8863](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8863)) - chore: `OrderedInterfacesFixer` - make code more PHPStan friendly ([#​8866](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8866)) - chore: `Token` - add `@phpstan-assert-if-true` ([#​8865](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8865)) - deps: bump phpstan/phpstan from 2.1.17 to 2.1.18 in /dev-tools in the phpstan group ([#​8859](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8859)) - deps: bump the phpstan group in /dev-tools with 4 updates ([#​8890](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8890)) - docs: better document reprecated rule sets ([#​8878](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8878)) - docs: cleanup docs for PHP 7 ([#​8873](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8873)) - docs: cleanup docs for PHP < 7.4 ([#​8855](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8855)) - docs: ListSetsCommand,FixCommand - document possible formats in Command's definitions ([#​8880](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8880)) - DX: Explicitly prevent touching non-monolithic files ([#​6517](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/6517)) ### [`v3.84.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3840) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.83.0...v3.84.0) - feat: Introduce `NoUselessPrintfFixer` ([#​8820](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8820)) - feat: `CastSpacesFixer` - support `(void)` cast ([#​8851](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8851)) - feat: `NewExpressionParenthesesFixer` - add to `PHP84MigrationSet` ([#​8788](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8788)) - feat: `VisibilityRequiredFixer` - support final promoted properties ([#​8835](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8835)) - fix: `PhpdocToParamTypeFixer` - do not convert types from `phpstan-type`, `phpstan-import-type`, `psalm-type` and `psalm-import-type` ([#​8842](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8842)) - fix: `PhpdocToPropertyTypeFixer` - do not convert types from `phpstan-type`, `phpstan-import-type`, `psalm-type` and `psalm-import-type` ([#​8847](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8847)) - fix: `PhpdocToReturnTypeFixer` - do not convert types from `phpstan-type`, `phpstan-import-type`, `psalm-type` and `psalm-import-type` ([#​8846](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8846)) - chore: introduce FCT for few missing tokens ([#​8845](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8845)) - chore: remove useless static variables for const content ([#​8836](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8836)) - chore: simplify `isGivenKind`/`equals`/`equalsAll` calls ([#​8843](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8843)) - docs: Support for new PHP version ([#​8780](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8780)) ### [`v3.83.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3830) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.82.2...v3.83.0) - feat: Suppress enable parallel runner message when only 1 core is available ([#​8833](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8833)) - fix: BracesPositionFixer - fix performance issue for massive files with CT::T\_CURLY\_CLOSE ([#​8830](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8830)) - fix: `NoUnreachableDefaultArgumentValueFixer` - do not crash on property hook ([#​8838](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8838)) - chore: Add CS commit to .git-blame-ignore-revs - chore: apply native\_constant\_invocation for build-in consts ([#​8837](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8837)) - chore: configure native\_constant\_invocation ([#​8840](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8840)) - chore: early compat check with Symfony 8 ([#​8827](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8827)) - chore: `FullyQualifiedStrictTypesFixer` - reduce function calls ([#​8834](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8834)) - CI: mark jobs allow-to-fail declarative, instead of imperative check ([#​8829](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8829)) ### [`v3.82.2`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3822) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.82.1...v3.82.2) - fix: `ClassAttributesSeparationFixer` - handle method `get` aliased in trait import ([#​8822](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8822)) - fix: `LowercaseStaticReferenceFixer` - do not touch enum's cases ([#​8824](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8824)) - fix: `StatementIndentationFixer` - multi constant statement containing array ([#​8825](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8825)) - fix: `VisibilityRequiredFixer` - handle promoted property with visibility and reference, but without type ([#​8823](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8823)) ### [`v3.82.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3821) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.82.0...v3.82.1) - fix: `OrderedClassElementsFixer` - handle property hooks ([#​8817](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8817)) - fix: `SingleClassElementPerStatementFixer` - fix for property hooks ([#​8816](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8816)) ### [`v3.82.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3820) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.81.0...v3.82.0) - chore: cleanup `FCTTest` ([#​8808](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8808)) - chore: PhpdocOrderFixer.php - CPU optimization ([#​8812](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8812)) - deps: update box ([#​8795](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8795)) - docs: fix whitespace around code examples and reference sections in rules' docs ([#​8810](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8810)) - feat: `MagicConstantCasingFixer` - support `__PROPERTY__` ([#​8809](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8809)) - feat: `PhpUnitDataProviderNameFixer` - support data providers defined by both annotation and attribute for the same test ([#​8811](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8811)) - fix: `PhpdocToParamTypeFixer` - always handle reference in PHPDoc ([#​8813](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8813)) ### [`v3.81.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3810) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.80.0...v3.81.0) - feat: `VisibilityRequiredFixer` - handle more than only the first promoted property ([#​8801](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8801)) - fix: `BracesPositionFixer` - do not crash when variable is terminated by PHP close tag ([#​8804](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8804)) - fix: `PhpUnitDataProviderMethodOrderFixer` - handle data provider defined by both annotation and attribute ([#​8805](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8805)) - fix: `PhpUnitInternalClassFixer` - skip adding `@internal` on instantiation of anonymous classes ([#​8807](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8807)) - fix: `VisibilityRequiredFixer` - handle promoted parameter passed by reference ([#​8799](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8799)) - chore: add automatically to milestone "PHP 8.5 initial compatibility" if label is "topic/PHP8.5" ([#​8806](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8806)) - chore: fail "Deployment checks" if any job from `tests` failed ([#​8792](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8792)) - docs: update docs about --allow-unsupported-php-version ([#​8796](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8796)) ### [`v3.80.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3800) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.79.0...v3.80.0) - feat: PHP 8.4 compatibility support ([#​8300](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8300)) ### [`v3.79.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3790) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.78.1...v3.79.0) - chore: `VisibilityRequiredFixerTest` - run tests in correct PHP version ([#​8790](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8790)) - feat: `BracesPositionFixer` - do not touch one-line properties with hooks ([#​8785](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8785)) - feat: `PhpUnitDataProvider(.+)Fixer` - support attributes ([#​8197](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8197)) ### [`v3.78.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3781) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.78.0...v3.78.1) - fix: `VisibilityRequiredFixer` - do not add `public` incorrectly ([#​8787](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8787)) ### [`v3.78.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3780) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.77.0...v3.78.0) - chore: `VisibilityRequiredFixer` - document behaviour for asymmetric visibility with only set-visibility ([#​8783](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8783)) - feat: `BracesPositionFixer` - support property hooks ([#​8782](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8782)) - feat: `VisibilityRequiredFixer` - support promoted property without visibility ([#​8773](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8773)) - fix: `NativeFunctionInvocationFixer` - fix global function `set` called in array key ([#​8568](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8568)) - fix: `NoBreakCommentFixer` - handle function having return type ([#​8767](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8767)) - fix: `StatementIndentationFixer` - handle functions `set` and `get` (like property hooks, but not) ([#​8576](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8576)) - fix: `StaticPrivateMethodFixer` - handle nested calls ([#​8768](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8768)) ### [`v3.77.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3770) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.76.0...v3.77.0) - chore: add automatically to milestone "PHP 8.4 initial compatibility" if label is "topic/PHP8.4" ([#​8770](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8770)) - chore: Add CS commit to .git-blame-ignore-revs - chore: fix adding automatically to milestone "PHP 8.4 initial compatibility" if label is "topic/PHP8.4" ([#​8775](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8775)) - chore: fix adding automatically to milestone "PHP 8.4 initial compatibility" if label is "topic/PHP8.4" ([#​8776](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8776)) - chore: move all indicators to analyzers ([#​8772](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8772)) - chore: move PHP-compat integration tests ([#​8781](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8781)) - chore: partially apply NoExtraBlankLinesFixer:tokens.comma ([#​8762](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8762)) - chore: reconfigure phpdoc\_order in local config ([#​8220](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8220)) - feat: PhpdocOrderFixer - extend support for phpstan and psalm annotations ([#​8777](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8777)) - feat: support anonymous classes extending `TestCase` in PHPUnit fixers ([#​8707](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8707)) - feat: `CommentToPhpdocFixer` and `PhpdocToCommentFixer` - support asymmetric visibility ([#​8774](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8774)) - feat: `NoEmptyStatementFixer` - support abstract property hooks ([#​8766](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8766)) - feat: `NullableTypeDeclarationForDefaultNullValueFixer` - support asymmetric visibility in the constructor ([#​8604](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8604)) - feat: `ProtectedToPrivateFixer` - add support for promoted properties ([#​8608](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8608)) - fix: `PhpUnitAttributesFixer` - correctly remove annotations when configured `['keep_annotations' => false]` ([#​8577](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8577)) - fix: `ProtectedToPrivateFixer` - fix asymmetric visibility with only set visibility ([#​8763](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8763)) ### [`v3.76.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3760) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.75.0...v3.76.0) - chore(release): bump php ci alpine version ([#​8581](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8581)) - chore: add missing priority test for `BracesPositionFixer` and `MultilinePromotedPropertiesFixer` ([#​8596](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8596)) - chore: add more assertions in tests ([#​8740](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8740)) - chore: bump dependencies version to maximum for non-newest MAJOR version ([#​8753](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8753)) - chore: cast types in tests ([#​8742](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8742)) - chore: cleanup booleans use in tests ([#​8738](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8738)) - chore: cleanup code in tests ([#​8745](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8745)) - chore: cleanup PsrAutoloadingFixerTest.php keywords handling, as always defined currently ([#​8730](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8730)) - chore: cleanup `AlignMultilineCommentFixerTest` ([#​8688](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8688)) - chore: cleanup `BinaryOperatorSpacesFixerTest` ([#​8687](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8687)) - chore: cleanup `BlankLineBeforeStatementFixerTest` ([#​8685](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8685)) - chore: cleanup `ClassDefinitionFixerTest` ([#​8684](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8684)) - chore: cleanup `ClassDefinitionFixer` ([#​8580](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8580)) - chore: cleanup `ConcatSpaceFixerTest` ([#​8683](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8683)) - chore: cleanup `DoctrineAnnotationArrayAssignmentFixerTest` ([#​8621](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8621)) - chore: cleanup `DoctrineAnnotationBracesFixerTest` ([#​8623](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8623)) - chore: cleanup `DoctrineAnnotationIndentationFixerTest` ([#​8620](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8620)) - chore: cleanup `DoctrineAnnotationSpacesFixerTest` ([#​8624](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8624)) - chore: cleanup `EchoTagSyntaxFixerTest` ([#​8681](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8681)) - chore: cleanup `file_get_contents` return types ([#​8735](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8735)) - chore: cleanup `FunctionDeclarationFixerTest` ([#​8680](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8680)) - chore: cleanup `FunctionToConstantFixerTest` ([#​8618](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8618)) - chore: cleanup `GeneralPhpdocTagRenameFixerTest` ([#​8627](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8627)) - chore: cleanup `GlobalNamespaceImportFixerTest` ([#​8679](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8679)) - chore: cleanup `HeaderCommentFixerTest` ([#​8677](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8677)) - chore: cleanup `HeaderCommentFixerTest` (restore `@requires` for PHP 8.1) ([#​8678](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8678)) - chore: cleanup `IncrementStyleFixerTest` ([#​8676](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8676)) - chore: cleanup `IndentationTypeFixerTest` ([#​8675](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8675)) - chore: cleanup `ListSyntaxFixerTest` ([#​8674](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8674)) - chore: cleanup `MethodArgumentSpaceFixerTest` ([#​8673](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8673)) - chore: cleanup `MultilineWhitespaceBeforeSemicolonsFixerTest` ([#​8614](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8614)) - chore: cleanup `NativeConstantInvocationFixerTest` ([#​8672](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8672)) - chore: cleanup `NewWithParenthesesFixerTest` ([#​8592](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8592)) - chore: cleanup `NoBlankLinesAfterPhpdocFixerTest` ([#​8671](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8671)) - chore: cleanup `NoBreakCommentFixerTest` ([#​8670](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8670)) - chore: cleanup `NoClosingTagFixerTest` ([#​8669](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8669)) - chore: cleanup `NoEmptyStatementFixerTest` ([#​8667](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8667)) - chore: cleanup `NoSpacesAroundOffsetFixerTest` ([#​8666](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8666)) - chore: cleanup `NoUnneededControlParenthesesFixerTest` ([#​8665](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8665)) - chore: cleanup `NoUselessElseFixerTest` ([#​8664](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8664)) - chore: cleanup `PhpdocAddMissingParamAnnotationFixerTest` ([#​8663](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8663)) - chore: cleanup `PhpdocNoEmptyReturnFixerTest` ([#​8662](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8662)) - chore: cleanup `PhpdocNoPackageFixerTest` ([#​8626](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8626)) - chore: cleanup `PhpdocOrderByValueFixerTest` ([#​8661](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8661)) - chore: cleanup `PhpdocOrderFixerTest` ([#​8660](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8660)) - chore: cleanup `PhpdocParamOrderFixerTest` ([#​8659](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8659)) - chore: cleanup `PhpdocReturnSelfReferenceFixerTest` ([#​8658](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8658)) - chore: cleanup `PhpdocSeparationFixerTest` ([#​8657](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8657)) - chore: cleanup `PhpdocSummaryFixerTest` ([#​8654](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8654)) - chore: cleanup `PhpdocTrimFixerTest` ([#​8653](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8653)) - chore: cleanup `PhpdocTypesOrderFixerTest` ([#​8652](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8652)) - chore: cleanup `PhpdocVarWithoutNameFixerTest` ([#​8617](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8617)) - chore: cleanup `PhpUnitConstructFixerTest` ([#​8651](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8651)) - chore: cleanup `PhpUnitDedicateAssertFixerTest` ([#​8650](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8650)) - chore: cleanup `PhpUnitTestCaseStaticMethodCallsFixerTest` ([#​8649](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8649)) - chore: cleanup `Preg` issues ([#​8720](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8720)) - chore: cleanup `ReturnAssignmentFixerTest` ([#​8648](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8648)) - chore: cleanup `ReturnTypeDeclarationFixerTest` ([#​8647](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8647)) - chore: cleanup `SingleImportPerStatementFixerTest` ([#​8645](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8645)) - chore: cleanup `SingleLineCommentStyleFixerTest` ([#​8644](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8644)) - chore: cleanup `SingleSpaceAroundConstructFixerTest` ([#​8642](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8642)) - chore: cleanup `SpaceAfterSemicolonFixerTest` ([#​8625](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8625)) - chore: cleanup `SpacesInsideParenthesesFixerTest` ([#​8641](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8641)) - chore: cleanup `StatementIndentationFixerTest` ([#​8640](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8640)) - chore: cleanup `YodaStyleFixerTest` ([#​8638](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8638)) - chore: do not check if `JSON_INVALID_UTF8_IGNORE` is defined because it always is (since PHP 7.2) ([#​8709](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8709)) - chore: handle saveXML failures explicitly ([#​8755](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8755)) - chore: ignore remaining PHPStan (false positive) issues ([#​8746](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8746)) - chore: improve PHPDoc's types in ([#​8741](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8741)) - chore: improve PHPDocs in tests ([#​8736](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8736)) - chore: improve PHPDocs in tests ([#​8744](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8744)) - chore: improve type of `Token::equalsAny` ([#​8743](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8743)) - chore: lint yaml files ([#​8622](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8622)) - chore: MultilinePromotedPropertiesFixer - mark new fixer introduced in [#​8595](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8595) as experimental ([#​8758](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8758)) - chore: PHPMD - cleanup `UnusedLocalVariable` for `foreach` ([#​8637](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8637)) - chore: refactor FCT ([#​8714](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8714)) - chore: remove unused local variables in src ([#​8600](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8600)) - chore: remove unused local variables in tests ([#​8599](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8599)) - chore: remove useless test from `AliasedFixerOptionTest` ([#​8739](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8739)) - chore: remove `defined` calls from tests ([#​8708](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8708)) - chore: restore original type of Token::equalsAny, partially reverts [#​8743](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8743) ([#​8759](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8759)) - chore: run mutation tests on PHP 8.4 ([#​8594](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8594)) - chore: solve one of phpstan warnings ([#​8754](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8754)) - chore: update dev tools ([#​8737](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8737)) - chore: update PHPUnit config ([#​8721](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8721)) - chore: update `checkbashisms` to 2.25.12 ([#​8694](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8694)) - chore: update `checkbashisms` to 2.25.14 ([#​8731](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8731)) - chore: use PHPStan type in data providers ([#​8605](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8605)) - chore: use `foreach` values ([#​8636](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8636)) - chore: use `Preg` class everywhere ([#​8689](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8689)) - CI: add self-approved label ([#​8757](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8757)) - CI: run on PHP 8.5 ([#​8713](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8713)) - deps: bump alpine from 3.21.3 to 3.22.0 ([#​8724](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8724)) - deps: bump alpine from 3.21.3 to 3.22.0 ([#​8726](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8726)) - deps: bump ergebnis/composer-normalize from 2.45.0 to 2.46.0 in /dev-tools ([#​8578](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8578)) - deps: bump ergebnis/composer-normalize from 2.46.0 to 2.47.0 in /dev-tools ([#​8584](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8584)) - deps: bump phpstan/phpstan from 2.1.11 to 2.1.12 in /dev-tools in the phpstan group ([#​8583](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8583)) - deps: bump phpstan/phpstan-symfony from 2.0.3 to 2.0.4 in /dev-tools in the phpstan group ([#​8557](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8557)) - deps: bump the phpstan group across 1 directory with 2 updates ([#​8682](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8682)) - deps: upgrade docker deps ([#​8566](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8566)) - docs: extend and fix links to code ([#​8639](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8639)) - docs: Update SECURITY.md ([#​8716](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8716)) - docs: VisibilityRequiredFixer - extend docs ([#​8561](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8561)) - docs: `VisibilityRequiredFixer` - update docs ([#​8563](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8563)) - DX: add `symfony/polyfill-php84` ([#​8555](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8555)) - DX: always use the latest stable `checkbashisms` package ([#​8732](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8732)) - DX: check for `preg_` functions in tests ([#​8571](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8571)) - DX: cleanup `BlankLinesBeforeNamespaceFixerTest` ([#​8573](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8573)) - DX: cleanup `NativeFunctionInvocationFixerTest` ([#​8567](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8567)) - DX: cleanup `NoUselessConcatOperatorFixerTest` ([#​8572](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8572)) - DX: cleanup `SemicolonAfterInstructionFixerTest` ([#​8570](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8570)) - DX: fix data providers ([#​8693](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8693)) - DX: introduce `FCT` class for tokens not present in the lowest supported PHP version ([#​8706](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8706)) - DX: move `symfony/polyfill-php84` to dev deps ([#​8559](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8559)) - DX: support PHP 8.4 in local Docker development environment ([#​8564](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8564)) - DX: trim array/yield keys ([#​8460](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8460)) - DX: use `WhitespacesAwareFixerInterface` only when needed ([#​8541](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8541)) - feat: add `NewExpressionParenthesesFixer` ([#​8246](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8246)) - feat: allowUnsupportedPhpVersion ([#​8733](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8733)) - feat: introduce `MultilinePromotedPropertiesFixer` ([#​8595](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8595)) - feat: Introduce `StaticPrivateMethodFixer` ([#​4557](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/4557)) - feat: `BracesPositionFixer` - support property hooks in promoted properties ([#​8613](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8613)) - feat: `ClassAttributesSeparationFixer` - add support for property hooks ([#​8610](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8610)) - feat: `GlobalNamespaceImportFixer` - analyze and fix more annotations with types ([#​8593](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8593)) - feat: `LowercaseKeywordsFixer` - support asymmetric visibility ([#​8607](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8607)) - feat: `NoExtraBlankLinesFixer` - add comma to supported tokens ([#​8655](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8655)) - feat: `NoSuperfluousPhpdocTagsFixer` - support asymmetric visibility ([#​8700](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8700)) - feat: `NullableTypeDeclarationFixer` - support asymmetric visibility ([#​8697](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8697)) - feat: `OrderedClassElementsFixer` - add support for property hooks for abstract properties ([#​8574](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8574)) - feat: `OrderedTypesFixer` - add support for asymmetric visibility ([#​8552](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8552)) - feat: `OrderedTypesFixer` - support asymmetric visibility in promoted property ([#​8602](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8602)) - feat: `PhpdocAddMissingParamAnnotationFixer` - support asymmetric visibility ([#​8701](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8701)) - feat: `PhpdocLineSpanFixer` - support asymmetric visibility ([#​8702](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8702)) - feat: `PhpdocVarWithoutNameFixer` - support asymmetric visibility ([#​8704](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8704)) - feat: `ProtectedToPrivateFixer` - add support for asymmetric visibility ([#​8569](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8569)) - feat: `SingleClassElementPerStatementFixer` - support asymmetric visibility ([#​8696](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8696)) - feat: `SingleSpaceAroundConstructFixer` - add support for asymmetric visibility ([#​8699](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8699)) - feat: `StaticLambdaFixer` - support functions having classy elements with `$this` ([#​8728](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8728)) - feat: `VisibilityRequiredFixer` - support ordering set-visibility modifier ([#​8606](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8606)) - fix(dependabot): convert time values to string types ([#​8634](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8634)) - fix: "array" type must have no prefix to be fixable to "list" ([#​8692](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8692)) - fix: "min"/"max" in int generics must never be prefixed by backslash ([#​8691](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8691)) - fix: Allow non-doc comment on opening inline brace line ([#​8690](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8690)) - fix: `ConstantCaseFixer` - do not touch namespaces starting with `Null\` ([#​8752](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8752)) - fix: `LowercaseStaticReferenceFixer` - do not change global constants ([#​8727](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8727)) - fix: `MultilineWhitespaceBeforeSemicolonsFixer` - do not touch multiline constants definitions ([#​8615](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8615)) - fix: `NewWithParenthesesFixer` - fix `new` without parentheses on PHP 8.4 syntax ([#​8588](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8588)) - fix: `NoMultipleStatementsPerLineFixer` - handle `set` and `get` in different casing in property hooks ([#​8558](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8558)) - fix: `NoUnusedImportsFixer` - handle imported class name with underscore before or after it in PHPDoc ([#​8598](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8598)) - fix: `PhpUnitDedicateAssertFixer` - fix for `assertFalse` with `instanceof` ([#​8597](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8597)) - fix: `PhpUnitNamespacedFixer` must rune before `NoUnneededImportAliasFixer` ([#​8579](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8579)) - fix: `PhpUnitTestClassRequiresCoversFixer` - do not add `@coversNothing` annotation when `CoversTrait` attribute is used ([#​8734](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8734)) - fix: `VisibilityRequiredFixer` - add support for asymmetric visibility ([#​8586](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8586)) - refactor: avoid unused local variables in tests ([#​8609](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8609)) - test: add more cases to `PhpUnitMethodCasingFixerTest` ([#​8551](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8551)) - test: fix "unused local variables `$token`" ([#​8603](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8603)) - test: More verbose error output for integration test ([#​8565](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8565)) - Update SECURITY.md ### [`v3.75.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3750) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.74.0...v3.75.0) - feat: `ClassAttributesSeparationFixer` - add support for asymmetric visibility ([#​8518](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8518)) - fix: `NativeFunctionInvocationFixer` - fix for property hooks ([#​8540](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8540)) - chore: add return types for data providers for fixers ([#​8542](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8542)) - chore: add return types for data providers for non-fixers ([#​8543](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8543)) - chore: add return types for remaining data providers ([#​8544](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8544)) - chore: make data providers key type `int` if all the keys are strings ([#​8550](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8550)) - chore: make data providers key type `string` if all the keys are strings ([#​8545](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8545)) - chore: SwitchContinueToBreakFixerTest - improve test case descriptions/typehint ([#​8546](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8546)) - chore: `FunctionsAnalyzerTest` cleanup ([#​8539](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8539)) - deps: bump the phpstan group in /dev-tools with 2 updates ([#​8537](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8537)) - test: ProjectCodeTest::testDataProvidersDeclaredReturnType - allow for int as iterable keys ([#​8548](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8548)) ### [`v3.74.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3740) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.73.1...v3.74.0) - feat: add `--format=@​auto` ([#​8513](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8513)) - fix: `BracesPositionFixer` - do not create two consecutive whitespace tokens ([#​8496](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8496)) - fix: `MbStrFunctionsFixer` - fix imports with leading backslash ([#​8507](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8507)) - fix: `NoUnreachableDefaultArgumentValueFixer` - do not crash on property hook ([#​8512](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8512)) - fix: `OrderedImportsFixer` - do not take the braces part in grouped imports into account ([#​8459](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8459)) - fix: `OrderedImportsFixer` - fix syntax error with grouped use statement and multiple use with comma ([#​8483](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8483)) - fix: `PhpUnitAttributesFixer` - handle parentheses after data provider method name ([#​8510](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8510)) - fix: `PhpUnitMethodCasingFixer` - do not touch anonymous class ([#​8463](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8463)) - chore: make options that have default and allowed sets the same size the same array ([#​8529](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8529)) - chore: update return type of `FixerOptionInterface::getAllowedValues` ([#​8530](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8530)) - chore: `Preg` - improve types ([#​8527](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8527)) - CI: fix code coverage job ([#​8520](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8520)) - CI: try MacOS job without ParaUnit ([#​8528](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8528)) - deps: update PHPStan ([#​8531](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8531)) - deps: upgrade `PHPStan/*` ([#​8524](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8524)) ### [`v3.73.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3731) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.73.0...v3.73.1) - fix: `OrderedClassElementsFixer` - do not crash on property hook ([#​8517](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8517)) ### [`v3.73.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3730) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.72.0...v3.73.0) - feat: add support for asymmetric visibility to Doctrine's fixers ([#​8415](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8415)) - fix: `GeneralPhpdocTagRenameFixer` - do not rename keys in array shape definition ([#​8477](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8477)) - fix: `MethodArgumentSpaceFixer` - handle when nested in HTML ([#​8503](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8503)) - chore: update `checkbashisms` to 2.25.5 ([#​8519](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8519)) - DX: cleanup `NoExtraBlankLinesFixerTest` ([#​8505](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8505)) - DX: for duplicated test methods check methods without parameters ([#​8508](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8508)) - DX: remove more duplicated test methods ([#​8506](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8506)) - refactor: `Tokenizer` hash metode using `xxHash` ([#​8491](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8491)) - refactor: `TokensAnalyzerTest` - better test `isArray` and `isArrayMultiLine` ([#​8504](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8504)) - test: run code coverage on PHP 8.4 ([#​8448](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8448)) ### [`v3.72.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3720) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.71.0...v3.72.0) - feat: `StatementIndentationFixer` - handle property hooks ([#​8492](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8492)) - fix: `MbStrFunctionsFixer` - fix imports ([#​8474](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8474)) - fix: `TrailingCommaInMultilineFixer` - handle empty match body ([#​8480](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8480)) - fix: `VisibilityRequiredFixer` - handle property hooks ([#​8495](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8495)) - deps: upgrade few dev-deps ([#​8490](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8490)) - deps: Upgrade PHPStan to 2.1.8 ([#​8489](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8489)) - DX: add trailing comma to multiline auto-generated types ([#​8499](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8499)) - refactor: generalize CodeHasher into Hasher ([#​8500](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8500)) - refactor: Runner - unify paths used when using parallel runner ([#​8488](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8488)) - refactor: use Hasher instead of md5 directly ([#​8501](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8501)) ### [`v3.71.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3710) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.70.2...v3.71.0) - feat: OrderedImportsFixer - deprecate length sorting algorithm ([#​8473](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8473)) - fix: `BinaryOperatorSpacesFixer` - do not break alignment of UTF-8 array keys ([#​8484](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8484)) - fix: `PhpdocAlignFixer` - align correctly type with UTF8 characters ([#​8486](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8486)) - fix: `SingleSpaceAroundConstructFixer` - handle alternative syntax ([#​8317](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8317)) - fix: `StatementIndentationFixer` - return in braceless if ([#​8479](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8479)) - chore: update type in `SingleSpaceAroundConstructFixerTest::provideFixWithElseIfCases` ([#​8481](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8481)) - chore: update type in `SingleSpaceAroundConstructFixerTest::provideFixWithIfCases` ([#​8482](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8482)) - deps: bump phpstan/phpstan from 2.1.6 to 2.1.7 in /dev-tools in the phpstan group ([#​8485](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8485)) - DX: cleanup `PhpdocNoAliasTagFixerTest` ([#​8476](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8476)) - refactor: add `FullyQualifiedNameAnalyzer` ([#​8048](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8048)) - refactor: codeHash - update when it's (re-)generated ([#​8470](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8470)) - refactor: `SwitchAnalyzer` - improve performance ([#​8407](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8407)) - test: NameQualifiedTransformerTest - correct test case ([#​8471](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8471)) ### [`v3.70.2`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3702) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.70.1...v3.70.2) - deps: upgrade deep dev-tools deps ([#​8472](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8472)) - fix: `MbStrFunctionsFixer` must run before `NativeFunctionInvocationFixer` ([#​8466](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8466)) - fix: `MethodArgumentSpaceFixer` - fix nested calls for `ensure_fully_multiline` option ([#​8469](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8469)) ### [`v3.70.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3701) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.70.0...v3.70.1) - fix: `PhpUnitSizeClassFixer` must run before `PhpUnitAttributesFixer` ([#​8457](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8457)) - DX: cleanup `OrderedImportsFixerTest` ([#​8458](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8458)) ### [`v3.70.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3700) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.69.1...v3.70.0) - feat: Add `PhpUnitDataProviderMethodOrderFixer` fixer ([#​8225](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8225)) - feat: `HeaderCommentFixer` - allow validators ([#​8452](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8452)) - feat: `PhpCsFixer` ruleset: use `operator_linebreak` rule for all operators ([#​8417](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8417)) - feat: `PhpUnitMethodCasingFixer` to support PHPUnit's `Test` attribute ([#​8451](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8451)) - feat: `TypeDeclarationSpacesFixer` - Fix whitespace between const type and const name ([#​8442](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8442)) - chore: extend bug report template ([#​8447](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8447)) - chore: extend bug report template - more installation options ([#​8450](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8450)) - CI: phpstan-symfony - add entry point for console ([#​8292](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8292)) - deps: bump alpine from 3.21.2 to 3.21.3 ([#​8454](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8454)) - deps: bump phpstan/phpstan from 2.1.5 to 2.1.6 in /dev-tools in the phpstan group ([#​8453](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8453)) - fix: `CommentsAnalyzer` - allow other forms of assignment as valid structural elements for PHPDocs ([#​8371](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8371)) - fix: `PhpUnitTestClassRequiresCoversFixer` must run before `PhpUnitAttributesFixer` ([#​8444](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8444)) - test: fix `CheckCommandTest::testDryRunModeIsUnavailable` to correctly check that option `--dry-run` is unavailable ([#​8438](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8438)) ### [`v3.69.1`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3691) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.69.0...v3.69.1) - fix: `PhpUnitAttributesFixer` - convert correctly version constraint ([#​8439](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8439)) - test: `PhpUnitAttributesFixer` must run before `NoEmptyPhpdocFixer` ([#​8443](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8443)) ### [`v3.69.0`](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3690) [Compare Source](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.68.5...v3.69.0) - feat: Add unsealed array shape phpdoc support ([#​8299](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8299)) - fix: `OrderedClassElementsFixer` - sort correctly typed constants ([#​8408](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8408)) - chore: do not use test class as test data ([#​8430](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8430)) - chore: update `checkbashisms` to 2.25.2 ([#​8427](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8427)) - chore: use constants instead of literal strings ([#​8422](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8422)) - CI: no need to unlock deps on master ([#​8426](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8426)) - CI: run tests using PHPUnit 12 ([#​8431](https://redirect.github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8431)) - deps: bump kubawerlos/composer-s </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/libretime/libretime). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS41MS4xIiwidXBkYXRlZEluVmVyIjoiNDEuNTEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicGhwIl19--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jo <ljonas@riseup.net>
This commit is contained in:
renovate[bot]
GitHub
parent
5d7df2feb7
commit
eb9b8bdf81
@ -164,8 +164,9 @@ class WidgetHelper
|
||||
foreach ($arr as &$a) {
|
||||
if (is_array($a)) {
|
||||
if (array_key_exists('image_path', $a)) {
|
||||
$a['image_path'] = $a['image_path'] && $a['image_path'] !== '' ?
|
||||
Config::getPublicUrl() . 'api/show-logo?id=' . $a['id'] : '';
|
||||
$a['image_path'] = $a['image_path'] && $a['image_path'] !== ''
|
||||
? Config::getPublicUrl() . 'api/show-logo?id=' . $a['id']
|
||||
: '';
|
||||
} else {
|
||||
self::findAndConvertPaths($a);
|
||||
}
|
||||
|
||||
@ -824,12 +824,11 @@ class ApiController extends Zend_Controller_Action
|
||||
$endDateTime = clone $nowDateTime;
|
||||
$endDateTime = $endDateTime->add(new DateInterval('PT2H'));
|
||||
|
||||
$this->view->shows =
|
||||
Application_Model_Show::getShows(
|
||||
$nowDateTime,
|
||||
$endDateTime,
|
||||
$onlyRecord = true
|
||||
);
|
||||
$this->view->shows = Application_Model_Show::getShows(
|
||||
$nowDateTime,
|
||||
$endDateTime,
|
||||
$onlyRecord = true
|
||||
);
|
||||
|
||||
$this->view->is_recording = false;
|
||||
$this->view->server_timezone = Application_Model_Preference::GetDefaultTimezone();
|
||||
@ -1048,8 +1047,7 @@ class ApiController extends Zend_Controller_Action
|
||||
$dir_id = $request->getParam('dir_id');
|
||||
$all = $request->getParam('all');
|
||||
|
||||
$this->view->files =
|
||||
Application_Model_StoredFile::listAllFiles($dir_id, $all);
|
||||
$this->view->files = Application_Model_StoredFile::listAllFiles($dir_id, $all);
|
||||
}
|
||||
|
||||
public function getStreamSettingAction()
|
||||
@ -1349,8 +1347,7 @@ class ApiController extends Zend_Controller_Action
|
||||
$streams = ['s1', 's2', 's3', 's4'];
|
||||
$stream_params = [];
|
||||
foreach ($streams as $s) {
|
||||
$stream_params[$s] =
|
||||
Application_Model_StreamSetting::getStreamDataNormalized($s);
|
||||
$stream_params[$s] = Application_Model_StreamSetting::getStreamDataNormalized($s);
|
||||
}
|
||||
$this->view->stream_params = $stream_params;
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@ final class LocaleController extends Zend_Controller_Action
|
||||
header('Content-type: text/javascript');
|
||||
|
||||
$locale = Application_Model_Preference::GetLocale();
|
||||
echo 'var datatables_dict =' .
|
||||
file_get_contents(
|
||||
echo 'var datatables_dict ='
|
||||
. file_get_contents(
|
||||
Application_Common_OsPath::join(
|
||||
// $_SERVER["DOCUMENT_ROOT"],
|
||||
dirname(__FILE__) . '/../../public/', // Fixing this... -- Albert
|
||||
|
||||
@ -97,8 +97,9 @@ class PreferenceController extends Zend_Controller_Action
|
||||
// Append sharing token (download key) to Station podcast URL
|
||||
$stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId());
|
||||
$key = Application_Model_Preference::getStationPodcastDownloadKey();
|
||||
$url = Config::getPublicUrl() .
|
||||
(((int) $values->stationPodcastPrivacy) ? "feeds/station-rss?sharing_token={$key}" : 'feeds/station-rss');
|
||||
$url = Config::getPublicUrl() . (((int) $values->stationPodcastPrivacy)
|
||||
? "feeds/station-rss?sharing_token={$key}"
|
||||
: 'feeds/station-rss');
|
||||
$stationPodcast->setDbUrl($url)->save();
|
||||
Application_Model_Preference::setStationPodcastPrivacy($values->stationPodcastPrivacy);
|
||||
|
||||
|
||||
@ -48,14 +48,14 @@ class ScheduleController extends Zend_Controller_Action
|
||||
$events = json_encode($scheduleController->view->events);
|
||||
|
||||
$this->view->headScript()->appendScript(
|
||||
"var calendarPref = {};\n" .
|
||||
'calendarPref.weekStart = ' . Application_Model_Preference::GetWeekStartDay() . ";\n" .
|
||||
'calendarPref.timestamp = ' . time() . ";\n" .
|
||||
'calendarPref.timezoneOffset = ' . Application_Common_DateHelper::getUserTimezoneOffset() . ";\n" .
|
||||
"calendarPref.timeScale = '" . Application_Model_Preference::GetCalendarTimeScale() . "';\n" .
|
||||
'calendarPref.timeInterval = ' . Application_Model_Preference::GetCalendarTimeInterval() . ";\n" .
|
||||
'calendarPref.weekStartDay = ' . Application_Model_Preference::GetWeekStartDay() . ";\n" .
|
||||
"var calendarEvents = {$events};"
|
||||
"var calendarPref = {};\n"
|
||||
. 'calendarPref.weekStart = ' . Application_Model_Preference::GetWeekStartDay() . ";\n"
|
||||
. 'calendarPref.timestamp = ' . time() . ";\n"
|
||||
. 'calendarPref.timezoneOffset = ' . Application_Common_DateHelper::getUserTimezoneOffset() . ";\n"
|
||||
. "calendarPref.timeScale = '" . Application_Model_Preference::GetCalendarTimeScale() . "';\n"
|
||||
. 'calendarPref.timeInterval = ' . Application_Model_Preference::GetCalendarTimeInterval() . ";\n"
|
||||
. 'calendarPref.weekStartDay = ' . Application_Model_Preference::GetWeekStartDay() . ";\n"
|
||||
. "var calendarEvents = {$events};"
|
||||
);
|
||||
|
||||
$this->view->headScript()->appendFile(Assets::url('js/contextmenu/jquery.contextMenu.js'), 'text/javascript');
|
||||
@ -385,13 +385,12 @@ class ScheduleController extends Zend_Controller_Action
|
||||
$originalDateTime = new DateTime($originalShowStart, new DateTimeZone('UTC'));
|
||||
$originalDateTime->setTimezone($displayTimeZone);
|
||||
|
||||
$this->view->additionalShowInfo =
|
||||
sprintf(
|
||||
_('Rebroadcast of show %s from %s at %s'),
|
||||
$originalShowName,
|
||||
$originalDateTime->format('l, F jS'),
|
||||
$originalDateTime->format('G:i')
|
||||
);
|
||||
$this->view->additionalShowInfo = sprintf(
|
||||
_('Rebroadcast of show %s from %s at %s'),
|
||||
$originalShowName,
|
||||
$originalDateTime->format('l, F jS'),
|
||||
$originalDateTime->format('G:i')
|
||||
);
|
||||
}
|
||||
$this->view->showLength = $show->getShowLength();
|
||||
$this->view->timeFilled = $show->getTimeScheduled();
|
||||
@ -482,8 +481,7 @@ class ScheduleController extends Zend_Controller_Action
|
||||
|
||||
$forms = $this->createShowFormAction();
|
||||
|
||||
[$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] =
|
||||
$service_showForm->preEditShowValidationCheck($data);
|
||||
[$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] = $service_showForm->preEditShowValidationCheck($data);
|
||||
|
||||
if ($service_showForm->validateShowForms(
|
||||
$forms,
|
||||
@ -543,8 +541,7 @@ class ScheduleController extends Zend_Controller_Action
|
||||
|
||||
$forms = $this->createShowFormAction();
|
||||
|
||||
[$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] =
|
||||
$service_showForm->preEditShowValidationCheck($data);
|
||||
[$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] = $service_showForm->preEditShowValidationCheck($data);
|
||||
|
||||
if ($service_showForm->validateShowForms(
|
||||
$forms,
|
||||
|
||||
@ -234,10 +234,9 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
|
||||
} elseif ($formData['add_show_repeat_type'] == 2 && $formData['add_show_monthly_repeat_type'] == 2) {
|
||||
$interval = 'P1M';
|
||||
} elseif ($formData['add_show_repeat_type'] == 2 && $formData['add_show_monthly_repeat_type'] == 3) {
|
||||
[$weekNumberOfMonth, $dayOfWeek] =
|
||||
Application_Service_ShowService::getMonthlyWeeklyRepeatInterval(
|
||||
new DateTime($start_time, $showTimezone)
|
||||
);
|
||||
[$weekNumberOfMonth, $dayOfWeek] = Application_Service_ShowService::getMonthlyWeeklyRepeatInterval(
|
||||
new DateTime($start_time, $showTimezone)
|
||||
);
|
||||
}
|
||||
|
||||
/* Check first show
|
||||
|
||||
@ -78,11 +78,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
|
||||
foreach ($criteria[$column] as &$constraint) {
|
||||
// convert to appropriate timezone timestamps only if the modifier is not a relative time
|
||||
if (!in_array($constraint['modifier'], ['before', 'after', 'between'])) {
|
||||
$constraint['value'] =
|
||||
Application_Common_DateHelper::UTCStringToUserTimezoneString($constraint['value']);
|
||||
$constraint['value'] = Application_Common_DateHelper::UTCStringToUserTimezoneString($constraint['value']);
|
||||
if (isset($constraint['extra'])) {
|
||||
$constraint['extra'] =
|
||||
Application_Common_DateHelper::UTCStringToUserTimezoneString($constraint['extra']);
|
||||
$constraint['extra'] = Application_Common_DateHelper::UTCStringToUserTimezoneString($constraint['extra']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1661,9 +1661,9 @@ SQL;
|
||||
$limits['items'] = null;
|
||||
}
|
||||
} else {
|
||||
$limits['time'] = $storedCrit['limit']['modifier'] == 'hours' ?
|
||||
intval(floatval($storedCrit['limit']['value']) * 60 * 60) :
|
||||
intval($storedCrit['limit']['value'] * 60);
|
||||
$limits['time'] = $storedCrit['limit']['modifier'] == 'hours'
|
||||
? intval(floatval($storedCrit['limit']['value']) * 60 * 60)
|
||||
: intval($storedCrit['limit']['value'] * 60);
|
||||
$limits['items'] = null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -410,31 +410,31 @@ SQL;
|
||||
$entry['cliplength'] = $obj->getDbLength();
|
||||
|
||||
if ($obj instanceof CcFiles && $obj) {
|
||||
$entry['cuein'] = isset($p_item['cuein']) ?
|
||||
$p_item['cuein'] : $obj->getDbCuein();
|
||||
$entry['cuein'] = isset($p_item['cuein'])
|
||||
? $p_item['cuein'] : $obj->getDbCuein();
|
||||
|
||||
$entry['cueout'] = isset($p_item['cueout']) ?
|
||||
$p_item['cueout'] : $obj->getDbCueout();
|
||||
$entry['cueout'] = isset($p_item['cueout'])
|
||||
? $p_item['cueout'] : $obj->getDbCueout();
|
||||
|
||||
$cue_in = isset($p_item['cueInSec']) ?
|
||||
$p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
|
||||
$cue_in = isset($p_item['cueInSec'])
|
||||
? $p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
|
||||
|
||||
$cue_out = isset($p_item['cueOutSec']) ?
|
||||
$p_item['cueOutSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']);
|
||||
$cue_out = isset($p_item['cueOutSec'])
|
||||
? $p_item['cueOutSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']);
|
||||
|
||||
$entry['cliplength'] = isset($p_item['length']) ?
|
||||
$p_item['length'] : Application_Common_DateHelper::secondsToPlaylistTime($cue_out - $cue_in);
|
||||
$entry['cliplength'] = isset($p_item['length'])
|
||||
? $p_item['length'] : Application_Common_DateHelper::secondsToPlaylistTime($cue_out - $cue_in);
|
||||
} elseif ($obj instanceof CcWebstream && $obj) {
|
||||
$entry['cuein'] = '00:00:00';
|
||||
$entry['cueout'] = $entry['cliplength'];
|
||||
}
|
||||
$entry['ftype'] = $objType;
|
||||
|
||||
$entry['fadein'] = isset($p_item['fadein']) ?
|
||||
$p_item['fadein'] : $entry['fadein'];
|
||||
$entry['fadein'] = isset($p_item['fadein'])
|
||||
? $p_item['fadein'] : $entry['fadein'];
|
||||
|
||||
$entry['fadeout'] = isset($p_item['fadeout']) ?
|
||||
$p_item['fadeout'] : $entry['fadeout'];
|
||||
$entry['fadeout'] = isset($p_item['fadeout'])
|
||||
? $p_item['fadeout'] : $entry['fadeout'];
|
||||
}
|
||||
|
||||
return $entry;
|
||||
|
||||
@ -65,8 +65,8 @@ class Application_Model_Preference
|
||||
// this case should not happen.
|
||||
$caller = debug_backtrace()[1]['function'];
|
||||
|
||||
throw new Exception('Invalid number of results returned. Should be ' .
|
||||
"0 or 1, but is '{$result}' instead, caller={$caller}");
|
||||
throw new Exception('Invalid number of results returned. Should be '
|
||||
. "0 or 1, but is '{$result}' instead, caller={$caller}");
|
||||
}
|
||||
if ($result == 1) {
|
||||
// result found
|
||||
@ -896,9 +896,9 @@ class Application_Model_Preference
|
||||
|
||||
public static function SetLatestLink($link)
|
||||
{
|
||||
$pattern = '#^(http|https|ftp)://' .
|
||||
'([a-zA-Z0-9]+\.)*[a-zA-Z0-9]+' .
|
||||
'(/[a-zA-Z0-9\-\.\_\~\:\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=]+)*/?$#';
|
||||
$pattern = '#^(http|https|ftp)://'
|
||||
. '([a-zA-Z0-9]+\.)*[a-zA-Z0-9]+'
|
||||
. '(/[a-zA-Z0-9\-\.\_\~\:\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=]+)*/?$#';
|
||||
if (preg_match($pattern, $link)) {
|
||||
self::setValue('latest_link', $link);
|
||||
}
|
||||
|
||||
@ -667,8 +667,8 @@ final class Application_Model_Scheduler
|
||||
Application_Common_Database::SINGLE
|
||||
);
|
||||
|
||||
$show_sql = 'SELECT * FROM cc_show WHERE id IN (' .
|
||||
'SELECT show_id FROM cc_show_instances WHERE id = ' . $ccSchedule['instance_id'] . ')';
|
||||
$show_sql = 'SELECT * FROM cc_show WHERE id IN ('
|
||||
. 'SELECT show_id FROM cc_show_instances WHERE id = ' . $ccSchedule['instance_id'] . ')';
|
||||
$ccShow = Application_Common_Database::prepareAndExecute(
|
||||
$show_sql,
|
||||
[],
|
||||
@ -685,8 +685,8 @@ final class Application_Model_Scheduler
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$show_sql = 'SELECT * FROM cc_show WHERE id IN (' .
|
||||
'SELECT show_id FROM cc_show_instances WHERE id = ' . $schedule['instance'] . ')';
|
||||
$show_sql = 'SELECT * FROM cc_show WHERE id IN ('
|
||||
. 'SELECT show_id FROM cc_show_instances WHERE id = ' . $schedule['instance'] . ')';
|
||||
$ccShow = Application_Common_Database::prepareAndExecute(
|
||||
$show_sql,
|
||||
[],
|
||||
@ -732,10 +732,10 @@ final class Application_Model_Scheduler
|
||||
*/
|
||||
$pos = $ccSchedule['position'];
|
||||
|
||||
$linkedItem_sql = 'SELECT ends FROM cc_schedule ' .
|
||||
"WHERE instance_id = {$instanceId} " .
|
||||
"AND position = {$pos} " .
|
||||
'AND playout_status != -1';
|
||||
$linkedItem_sql = 'SELECT ends FROM cc_schedule '
|
||||
. "WHERE instance_id = {$instanceId} "
|
||||
. "AND position = {$pos} "
|
||||
. 'AND playout_status != -1';
|
||||
$linkedItemEnds = Application_Common_Database::prepareAndExecute(
|
||||
$linkedItem_sql,
|
||||
[],
|
||||
@ -746,8 +746,8 @@ final class Application_Model_Scheduler
|
||||
// With dynamic smart blocks there may be different number of items in
|
||||
// each show. In case the position does not exist we need to select
|
||||
// the end time of the last position
|
||||
$maxPos_sql = 'SELECT max(position) from cc_schedule ' .
|
||||
"WHERE instance_id = {$instanceId}";
|
||||
$maxPos_sql = 'SELECT max(position) from cc_schedule '
|
||||
. "WHERE instance_id = {$instanceId}";
|
||||
$pos = Application_Common_Database::prepareAndExecute(
|
||||
$maxPos_sql,
|
||||
[],
|
||||
@ -759,10 +759,10 @@ final class Application_Model_Scheduler
|
||||
$pos = 0;
|
||||
$nextStartDT = new DateTime($instance->getDbStarts(), new DateTimeZone('UTC'));
|
||||
} else {
|
||||
$linkedItem_sql = 'SELECT ends FROM cc_schedule ' .
|
||||
"WHERE instance_id = {$instanceId} " .
|
||||
"AND position = {$pos} " .
|
||||
'AND playout_status != -1';
|
||||
$linkedItem_sql = 'SELECT ends FROM cc_schedule '
|
||||
. "WHERE instance_id = {$instanceId} "
|
||||
. "AND position = {$pos} "
|
||||
. 'AND playout_status != -1';
|
||||
$linkedItemEnds = Application_Common_Database::prepareAndExecute(
|
||||
$linkedItem_sql,
|
||||
[],
|
||||
@ -849,8 +849,8 @@ final class Application_Model_Scheduler
|
||||
$adjustFromDT = clone $nextStartDT;
|
||||
$doUpdate = true;
|
||||
|
||||
$movedItem_sql = 'SELECT * FROM cc_schedule ' .
|
||||
'WHERE id = ' . $file['sched_id'];
|
||||
$movedItem_sql = 'SELECT * FROM cc_schedule '
|
||||
. 'WHERE id = ' . $file['sched_id'];
|
||||
$sched = Application_Common_Database::prepareAndExecute(
|
||||
$movedItem_sql,
|
||||
[],
|
||||
@ -870,9 +870,9 @@ final class Application_Model_Scheduler
|
||||
* relative item is by its position
|
||||
*/
|
||||
if ($linked) {
|
||||
$movedItem_sql = 'SELECT * FROM cc_schedule ' .
|
||||
"WHERE position = {$originalPosition} " .
|
||||
"AND instance_id = {$instanceId}";
|
||||
$movedItem_sql = 'SELECT * FROM cc_schedule '
|
||||
. "WHERE position = {$originalPosition} "
|
||||
. "AND instance_id = {$instanceId}";
|
||||
|
||||
$sched = Application_Common_Database::prepareAndExecute(
|
||||
$movedItem_sql,
|
||||
@ -942,30 +942,30 @@ final class Application_Model_Scheduler
|
||||
|
||||
$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']);
|
||||
if ($doInsert) {
|
||||
$values[] = '(' .
|
||||
"'{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"'{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"'{$file['cuein']}', " .
|
||||
"'{$file['cueout']}', " .
|
||||
"'{$file['fadein']}', " .
|
||||
"'{$file['fadeout']}', " .
|
||||
"'{$file['cliplength']}', " .
|
||||
"{$pos}, " .
|
||||
"{$instanceId}, " .
|
||||
"{$fileId}, " .
|
||||
"{$streamId})";
|
||||
$values[] = '('
|
||||
. "'{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "'{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "'{$file['cuein']}', "
|
||||
. "'{$file['cueout']}', "
|
||||
. "'{$file['fadein']}', "
|
||||
. "'{$file['fadeout']}', "
|
||||
. "'{$file['cliplength']}', "
|
||||
. "{$pos}, "
|
||||
. "{$instanceId}, "
|
||||
. "{$fileId}, "
|
||||
. "{$streamId})";
|
||||
} elseif ($doUpdate) {
|
||||
$update_sql = 'UPDATE cc_schedule SET ' .
|
||||
"starts = '{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"ends = '{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"cue_in = '{$file['cuein']}', " .
|
||||
"cue_out = '{$file['cueout']}', " .
|
||||
"fade_in = '{$file['fadein']}', " .
|
||||
"fade_out = '{$file['fadeout']}', " .
|
||||
"clip_length = '{$file['cliplength']}', " .
|
||||
"position = {$pos}, " .
|
||||
"instance_id = {$instanceId} " .
|
||||
"WHERE id = {$sched['id']}";
|
||||
$update_sql = 'UPDATE cc_schedule SET '
|
||||
. "starts = '{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "ends = '{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "cue_in = '{$file['cuein']}', "
|
||||
. "cue_out = '{$file['cueout']}', "
|
||||
. "fade_in = '{$file['fadein']}', "
|
||||
. "fade_out = '{$file['fadeout']}', "
|
||||
. "clip_length = '{$file['cliplength']}', "
|
||||
. "position = {$pos}, "
|
||||
. "instance_id = {$instanceId} "
|
||||
. "WHERE id = {$sched['id']}";
|
||||
|
||||
Application_Common_Database::prepareAndExecute(
|
||||
$update_sql,
|
||||
@ -978,10 +978,10 @@ final class Application_Model_Scheduler
|
||||
++$pos;
|
||||
} // all files have been inserted/moved
|
||||
if ($doInsert) {
|
||||
$insert_sql = 'INSERT INTO cc_schedule ' .
|
||||
'(starts, ends, cue_in, cue_out, fade_in, fade_out, ' .
|
||||
'clip_length, position, instance_id, file_id, stream_id) VALUES ' .
|
||||
implode(',', $values) . ' RETURNING id';
|
||||
$insert_sql = 'INSERT INTO cc_schedule '
|
||||
. '(starts, ends, cue_in, cue_out, fade_in, fade_out, '
|
||||
. 'clip_length, position, instance_id, file_id, stream_id) VALUES '
|
||||
. implode(',', $values) . ' RETURNING id';
|
||||
|
||||
$stmt = $this->con->prepare($insert_sql);
|
||||
if ($stmt->execute()) {
|
||||
@ -1006,9 +1006,9 @@ final class Application_Model_Scheduler
|
||||
}
|
||||
|
||||
if ($adjustSched === true) {
|
||||
$followingItems_sql = 'SELECT * FROM cc_schedule ' .
|
||||
"WHERE starts >= '{$initalStartDT->format(DEFAULT_MICROTIME_FORMAT)}' " .
|
||||
"AND instance_id = {$instanceId} ";
|
||||
$followingItems_sql = 'SELECT * FROM cc_schedule '
|
||||
. "WHERE starts >= '{$initalStartDT->format(DEFAULT_MICROTIME_FORMAT)}' "
|
||||
. "AND instance_id = {$instanceId} ";
|
||||
if (count($excludeIds) > 0) {
|
||||
$followingItems_sql .= 'AND id NOT IN (' . implode(',', $excludeIds) . ') ';
|
||||
}
|
||||
@ -1023,11 +1023,11 @@ final class Application_Model_Scheduler
|
||||
foreach ($followingSchedItems as $item) {
|
||||
$endTimeDT = $this->findEndTime($nextStartDT, $item['clip_length']);
|
||||
$endTimeDT = $this->findTimeDifference($endTimeDT, $this->crossfadeDuration);
|
||||
$update_sql = 'UPDATE cc_schedule SET ' .
|
||||
"starts = '{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"ends = '{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', " .
|
||||
"position = {$pos} " .
|
||||
"WHERE id = {$item['id']}";
|
||||
$update_sql = 'UPDATE cc_schedule SET '
|
||||
. "starts = '{$nextStartDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "ends = '{$endTimeDT->format(DEFAULT_MICROTIME_FORMAT)}', "
|
||||
. "position = {$pos} "
|
||||
. "WHERE id = {$item['id']}";
|
||||
Application_Common_Database::prepareAndExecute(
|
||||
$update_sql,
|
||||
[],
|
||||
|
||||
@ -390,8 +390,8 @@ SQL;
|
||||
);
|
||||
|
||||
if ($overlapping) {
|
||||
return _("Cannot schedule overlapping shows.\nNote: Resizing a repeating show " .
|
||||
'affects all of its repeats.');
|
||||
return _("Cannot schedule overlapping shows.\nNote: Resizing a repeating show "
|
||||
. 'affects all of its repeats.');
|
||||
}
|
||||
}
|
||||
|
||||
@ -399,11 +399,11 @@ SQL;
|
||||
$hours = ($hours > 0) ? floor($hours) : ceil($hours);
|
||||
$mins = abs($deltaMin % 60);
|
||||
|
||||
$sql_gen = 'UPDATE cc_show_instances ' .
|
||||
'SET ends = (ends + :deltaDay1::INTERVAL + :interval1::INTERVAL) ' .
|
||||
'WHERE (id IN (' . implode(',', $instanceIds) . ') ' .
|
||||
'AND ends > :current_timestamp1) ' .
|
||||
"AND ((ends + :deltaDay2::INTERVAL + :interval2::INTERVAL - starts) <= interval '24:00')";
|
||||
$sql_gen = 'UPDATE cc_show_instances '
|
||||
. 'SET ends = (ends + :deltaDay1::INTERVAL + :interval1::INTERVAL) '
|
||||
. 'WHERE (id IN (' . implode(',', $instanceIds) . ') '
|
||||
. 'AND ends > :current_timestamp1) '
|
||||
. "AND ((ends + :deltaDay2::INTERVAL + :interval2::INTERVAL - starts) <= interval '24:00')";
|
||||
|
||||
Application_Common_Database::prepareAndExecute(
|
||||
$sql_gen,
|
||||
@ -417,10 +417,10 @@ SQL;
|
||||
'execute'
|
||||
);
|
||||
|
||||
$sql_gen = 'UPDATE cc_show_days ' .
|
||||
'SET duration = (CAST(duration AS interval) + :deltaDay3::INTERVAL + :interval3::INTERVAL) ' .
|
||||
'WHERE id IN (' . implode(',', $showDayIds) . ') ' .
|
||||
"AND ((CAST(duration AS interval) + :deltaDay4::INTERVAL + :interval4::INTERVAL) <= interval '24:00')";
|
||||
$sql_gen = 'UPDATE cc_show_days '
|
||||
. 'SET duration = (CAST(duration AS interval) + :deltaDay3::INTERVAL + :interval3::INTERVAL) '
|
||||
. 'WHERE id IN (' . implode(',', $showDayIds) . ') '
|
||||
. "AND ((CAST(duration AS interval) + :deltaDay4::INTERVAL + :interval4::INTERVAL) <= interval '24:00')";
|
||||
|
||||
Application_Common_Database::prepareAndExecute(
|
||||
$sql_gen,
|
||||
|
||||
@ -464,18 +464,18 @@ class CcFiles extends BaseCcFiles
|
||||
// Remove invalid UTF-8 characters
|
||||
// reject overly long 2 byte sequences, as well as characters above U+10000 and replace with ?
|
||||
$string = preg_replace(
|
||||
'/[\x00-\x08\x10\x0B\x0C\x0E-\x19\x7F]' .
|
||||
'|[\x00-\x7F][\x80-\xBF]+' .
|
||||
'|([\xC0\xC1]|[\xF0-\xFF])[\x80-\xBF]*' .
|
||||
'|[\xC2-\xDF]((?![\x80-\xBF])|[\x80-\xBF]{2,})' .
|
||||
'|[\xE0-\xEF](([\x80-\xBF](?![\x80-\xBF]))|(?![\x80-\xBF]{2})|[\x80-\xBF]{3,})/S',
|
||||
'/[\x00-\x08\x10\x0B\x0C\x0E-\x19\x7F]'
|
||||
. '|[\x00-\x7F][\x80-\xBF]+'
|
||||
. '|([\xC0\xC1]|[\xF0-\xFF])[\x80-\xBF]*'
|
||||
. '|[\xC2-\xDF]((?![\x80-\xBF])|[\x80-\xBF]{2,})'
|
||||
. '|[\xE0-\xEF](([\x80-\xBF](?![\x80-\xBF]))|(?![\x80-\xBF]{2})|[\x80-\xBF]{3,})/S',
|
||||
'?',
|
||||
$string
|
||||
);
|
||||
|
||||
// reject overly long 3 byte sequences and UTF-16 surrogates and replace with ?
|
||||
$string = preg_replace('/\xE0[\x80-\x9F][\x80-\xBF]' .
|
||||
'|\xED[\xA0-\xBF][\x80-\xBF]/S', '?', $string);
|
||||
$string = preg_replace('/\xE0[\x80-\x9F][\x80-\xBF]'
|
||||
. '|\xED[\xA0-\xBF][\x80-\xBF]/S', '?', $string);
|
||||
|
||||
// Do a final encoding conversion to
|
||||
return mb_convert_encoding($string, 'UTF-8', 'UTF-8');
|
||||
|
||||
@ -55,9 +55,9 @@ class Application_Service_HistoryService
|
||||
// -----------------------------------------------------------------------
|
||||
// Using the instance_id to filter the data.
|
||||
|
||||
$historyRange = '(' .
|
||||
'SELECT history.starts, history.ends, history.id AS history_id, history.instance_id' .
|
||||
' FROM cc_playout_history as history';
|
||||
$historyRange = '('
|
||||
. 'SELECT history.starts, history.ends, history.id AS history_id, history.instance_id'
|
||||
. ' FROM cc_playout_history as history';
|
||||
|
||||
if (isset($instanceId)) {
|
||||
$historyRange .= ' WHERE history.instance_id = :instance';
|
||||
@ -70,12 +70,12 @@ class Application_Service_HistoryService
|
||||
|
||||
$historyRange .= ') AS history_range';
|
||||
|
||||
$manualMeta = '(' .
|
||||
'SELECT %KEY%.value AS %KEY%, %KEY%.history_id' .
|
||||
' FROM (' .
|
||||
' SELECT * from cc_playout_history_metadata AS phm WHERE phm.key = :meta_%KEY%' .
|
||||
' ) AS %KEY%' .
|
||||
' ) AS %KEY%_filter';
|
||||
$manualMeta = '('
|
||||
. 'SELECT %KEY%.value AS %KEY%, %KEY%.history_id'
|
||||
. ' FROM ('
|
||||
. ' SELECT * from cc_playout_history_metadata AS phm WHERE phm.key = :meta_%KEY%'
|
||||
. ' ) AS %KEY%'
|
||||
. ' ) AS %KEY%_filter';
|
||||
|
||||
$mainSelect = [
|
||||
'history_range.starts',
|
||||
@ -111,40 +111,39 @@ class Application_Service_HistoryService
|
||||
}
|
||||
|
||||
// the files associated with scheduled playback in Airtime.
|
||||
$historyFile = '(' .
|
||||
'SELECT history.id AS history_id, history.file_id' .
|
||||
' FROM cc_playout_history AS history' .
|
||||
' WHERE history.file_id IS NOT NULL' .
|
||||
') AS history_file';
|
||||
$historyFile = '('
|
||||
. 'SELECT history.id AS history_id, history.file_id'
|
||||
. ' FROM cc_playout_history AS history'
|
||||
. ' WHERE history.file_id IS NOT NULL'
|
||||
. ') AS history_file';
|
||||
|
||||
$fileMd = '(' .
|
||||
'SELECT %NON_NULL_FILE_SELECT%' .
|
||||
' FROM cc_files AS file' .
|
||||
') AS file_md';
|
||||
$fileMd = '('
|
||||
. 'SELECT %NON_NULL_FILE_SELECT%'
|
||||
. ' FROM cc_files AS file'
|
||||
. ') AS file_md';
|
||||
|
||||
$fileMd = str_replace('%NON_NULL_FILE_SELECT%', implode(', ', $nonNullFileSelect), $fileMd);
|
||||
|
||||
// null files are from manually added data (filling in webstream info etc)
|
||||
$nullFile = '(' .
|
||||
'SELECT history.id AS history_id' .
|
||||
' FROM cc_playout_history AS history' .
|
||||
' WHERE history.file_id IS NULL' .
|
||||
') AS null_file';
|
||||
$nullFile = '('
|
||||
. 'SELECT history.id AS history_id'
|
||||
. ' FROM cc_playout_history AS history'
|
||||
. ' WHERE history.file_id IS NULL'
|
||||
. ') AS null_file';
|
||||
|
||||
// ----------------------------------
|
||||
// building the file inner query
|
||||
|
||||
$fileSqlQuery =
|
||||
'SELECT ' . implode(', ', $fileSelect) .
|
||||
" FROM {$historyFile}" .
|
||||
" LEFT JOIN {$fileMd} USING (file_id)" .
|
||||
' UNION' .
|
||||
' SELECT ' . implode(', ', $nullFileSelect) .
|
||||
" FROM {$nullFile}";
|
||||
$fileSqlQuery
|
||||
= 'SELECT ' . implode(', ', $fileSelect)
|
||||
. " FROM {$historyFile}"
|
||||
. " LEFT JOIN {$fileMd} USING (file_id)"
|
||||
. ' UNION'
|
||||
. ' SELECT ' . implode(', ', $nullFileSelect)
|
||||
. " FROM {$nullFile}";
|
||||
|
||||
foreach ($fileMdFilters as $filter) {
|
||||
$fileSqlQuery .=
|
||||
" LEFT JOIN {$filter} USING(history_id)";
|
||||
$fileSqlQuery .= " LEFT JOIN {$filter} USING(history_id)";
|
||||
}
|
||||
}
|
||||
|
||||
@ -158,18 +157,18 @@ class Application_Service_HistoryService
|
||||
$mainSelect[] = "{$key}_filter.{$key}::{$type}";
|
||||
}
|
||||
|
||||
$mainSqlQuery .=
|
||||
'SELECT ' . implode(', ', $mainSelect) .
|
||||
" FROM {$historyRange}";
|
||||
$mainSqlQuery
|
||||
.= 'SELECT ' . implode(', ', $mainSelect)
|
||||
. " FROM {$historyRange}";
|
||||
|
||||
if (isset($fileSqlQuery)) {
|
||||
$mainSqlQuery .=
|
||||
" LEFT JOIN ( {$fileSqlQuery} ) as file_info USING(history_id)";
|
||||
$mainSqlQuery
|
||||
.= " LEFT JOIN ( {$fileSqlQuery} ) as file_info USING(history_id)";
|
||||
}
|
||||
|
||||
foreach ($mdFilters as $filter) {
|
||||
$mainSqlQuery .=
|
||||
" LEFT JOIN {$filter} USING(history_id)";
|
||||
$mainSqlQuery
|
||||
.= " LEFT JOIN {$filter} USING(history_id)";
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
@ -216,8 +215,8 @@ class Application_Service_HistoryService
|
||||
if (count($orderBys) > 0) {
|
||||
$orders = implode(', ', $orderBys);
|
||||
|
||||
$mainSqlQuery .=
|
||||
" ORDER BY {$orders}";
|
||||
$mainSqlQuery
|
||||
.= " ORDER BY {$orders}";
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
@ -226,8 +225,8 @@ class Application_Service_HistoryService
|
||||
$displayLength = empty($opts['iDisplayLength']) ? -1 : intval($opts['iDisplayLength']);
|
||||
// limit the results returned.
|
||||
if ($displayLength !== -1) {
|
||||
$mainSqlQuery .=
|
||||
' OFFSET :offset LIMIT :limit';
|
||||
$mainSqlQuery
|
||||
.= ' OFFSET :offset LIMIT :limit';
|
||||
|
||||
$paramMap['offset'] = intval($opts['iDisplayStart']);
|
||||
$paramMap['limit'] = $displayLength;
|
||||
@ -339,9 +338,9 @@ class Application_Service_HistoryService
|
||||
) AS playout
|
||||
LEFT JOIN cc_files AS file ON (file.id = playout.file_id)) AS summary';
|
||||
|
||||
$mainSqlQuery .=
|
||||
'SELECT ' . implode(', ', $select) .
|
||||
" FROM {$fileSummaryTable}";
|
||||
$mainSqlQuery
|
||||
.= 'SELECT ' . implode(', ', $select)
|
||||
. " FROM {$fileSummaryTable}";
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// need to count the total rows to tell Datatables.
|
||||
@ -375,16 +374,16 @@ class Application_Service_HistoryService
|
||||
if ($numOrderColumns > 0) {
|
||||
$orders = implode(', ', $orderBys);
|
||||
|
||||
$mainSqlQuery .=
|
||||
" ORDER BY {$orders}";
|
||||
$mainSqlQuery
|
||||
.= " ORDER BY {$orders}";
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// using datatables params to add limits/offsets
|
||||
$displayLength = intval($opts['iDisplayLength']);
|
||||
if ($displayLength !== -1) {
|
||||
$mainSqlQuery .=
|
||||
' OFFSET :offset LIMIT :limit';
|
||||
$mainSqlQuery
|
||||
.= ' OFFSET :offset LIMIT :limit';
|
||||
|
||||
$paramMap['offset'] = $opts['iDisplayStart'];
|
||||
$paramMap['limit'] = $displayLength;
|
||||
|
||||
@ -466,8 +466,9 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
|
||||
// Logging::info($enclosure);
|
||||
$itemId = $item->get_id();
|
||||
$ingested = in_array($itemId, $episodeIds) ? (empty($episodeFiles[$itemId]) ? -1 : 1) : 0;
|
||||
$file = $ingested > 0 && !empty($episodeFiles[$itemId]) ?
|
||||
CcFiles::getSanitizedFileById($episodeFiles[$itemId]) : [];
|
||||
$file = $ingested > 0 && !empty($episodeFiles[$itemId])
|
||||
? CcFiles::getSanitizedFileById($episodeFiles[$itemId])
|
||||
: [];
|
||||
// If the analyzer hasn't finished with the file, leave it as pending
|
||||
if (!empty($file) && $file['import_status'] == CcFiles::IMPORT_STATUS_PENDING) {
|
||||
$ingested = -1;
|
||||
|
||||
@ -189,8 +189,8 @@ class Application_Service_SchedulerService
|
||||
}
|
||||
|
||||
$linkedShowSchedule_sql = $con->prepare(
|
||||
'select * from cc_schedule where instance_id = :instance_id ' .
|
||||
'order by starts'
|
||||
'select * from cc_schedule where instance_id = :instance_id '
|
||||
. 'order by starts'
|
||||
);
|
||||
$linkedShowSchedule_sql->bindParam(':instance_id', $instanceId);
|
||||
$linkedShowSchedule_sql->execute();
|
||||
@ -216,8 +216,8 @@ class Application_Service_SchedulerService
|
||||
|
||||
// get time_filled so we can update cc_show_instances
|
||||
if (!empty($linkedShowSchedule)) {
|
||||
$timeFilled_sql = 'SELECT time_filled FROM cc_show_instances ' .
|
||||
"WHERE id = {$linkedShowSchedule[0]['instance_id']}";
|
||||
$timeFilled_sql = 'SELECT time_filled FROM cc_show_instances '
|
||||
. "WHERE id = {$linkedShowSchedule[0]['instance_id']}";
|
||||
$timeFilled = Application_Common_Database::prepareAndExecute(
|
||||
$timeFilled_sql,
|
||||
[],
|
||||
@ -245,8 +245,8 @@ class Application_Service_SchedulerService
|
||||
self::clearShowInstanceContents($id);
|
||||
|
||||
// Now fill the show instance with the same content that $linkedShowSchedule has.
|
||||
$instanceStart_sql = 'SELECT starts FROM cc_show_instances ' .
|
||||
"WHERE id = {$id} " . 'ORDER BY starts';
|
||||
$instanceStart_sql = 'SELECT starts FROM cc_show_instances '
|
||||
. "WHERE id = {$id} " . 'ORDER BY starts';
|
||||
|
||||
// What's tricky here is that when we copy the content, we have to adjust
|
||||
// the start and end times of each track so they're inside the new show instance's time slot.
|
||||
@ -275,13 +275,13 @@ class Application_Service_SchedulerService
|
||||
$item['stream_id'] = 'null';
|
||||
}
|
||||
|
||||
$values[] = '(' . "'{$nextStartDT->format(DEFAULT_TIMESTAMP_FORMAT)}', " .
|
||||
"'{$endTimeDT->format(DEFAULT_TIMESTAMP_FORMAT)}', " .
|
||||
"'{$item['clip_length']}', " .
|
||||
"'{$item['fade_in']}', '{$item['fade_out']}', " .
|
||||
"'{$item['cue_in']}', '{$item['cue_out']}', " .
|
||||
"{$item['file_id']}, {$item['stream_id']}, " .
|
||||
"{$id}, {$item['position']})";
|
||||
$values[] = '(' . "'{$nextStartDT->format(DEFAULT_TIMESTAMP_FORMAT)}', "
|
||||
. "'{$endTimeDT->format(DEFAULT_TIMESTAMP_FORMAT)}', "
|
||||
. "'{$item['clip_length']}', "
|
||||
. "'{$item['fade_in']}', '{$item['fade_out']}', "
|
||||
. "'{$item['cue_in']}', '{$item['cue_out']}', "
|
||||
. "{$item['file_id']}, {$item['stream_id']}, "
|
||||
. "{$id}, {$item['position']})";
|
||||
|
||||
$nextStartDT = self::findTimeDifference(
|
||||
$endTimeDT,
|
||||
@ -290,10 +290,10 @@ class Application_Service_SchedulerService
|
||||
} // foreach show item
|
||||
|
||||
if (!empty($values)) {
|
||||
$insert_sql = 'INSERT INTO cc_schedule (starts, ends, ' .
|
||||
'clip_length, fade_in, fade_out, cue_in, cue_out, ' .
|
||||
'file_id, stream_id, instance_id, position) VALUES ' .
|
||||
implode(',', $values);
|
||||
$insert_sql = 'INSERT INTO cc_schedule (starts, ends, '
|
||||
. 'clip_length, fade_in, fade_out, cue_in, cue_out, '
|
||||
. 'file_id, stream_id, instance_id, position) VALUES '
|
||||
. implode(',', $values);
|
||||
Application_Common_Database::prepareAndExecute(
|
||||
$insert_sql,
|
||||
[],
|
||||
|
||||
@ -364,8 +364,8 @@ class Application_Service_ShowFormService
|
||||
|
||||
private function populateFormStyle($form)
|
||||
{
|
||||
$src = $this->ccShow->getDbImagePath() ?
|
||||
$this->imagePathToDataUri($this->ccShow->getDbImagePath()) : '';
|
||||
$src = $this->ccShow->getDbImagePath()
|
||||
? $this->imagePathToDataUri($this->ccShow->getDbImagePath()) : '';
|
||||
|
||||
$form->populate(
|
||||
[
|
||||
@ -405,8 +405,8 @@ class Application_Service_ShowFormService
|
||||
}
|
||||
|
||||
// return the data URI - data:{mime};base64,{data}
|
||||
return ($imageData === null || $imageData === '') ?
|
||||
'' : 'data: ' . mime_content_type($path) . ';base64,' . $imageData;
|
||||
return ($imageData === null || $imageData === '')
|
||||
? '' : 'data: ' . mime_content_type($path) . ';base64,' . $imageData;
|
||||
}
|
||||
|
||||
private function populateFormLive($form)
|
||||
|
||||
@ -77,8 +77,9 @@ class Application_Service_ShowService
|
||||
|
||||
// DateTime in shows's local time
|
||||
$newStartDateTime = new DateTime(
|
||||
$showData['add_show_start_date'] . ' ' .
|
||||
$showData['add_show_start_time'],
|
||||
$showData['add_show_start_date']
|
||||
. ' '
|
||||
. $showData['add_show_start_time'],
|
||||
new DateTimeZone($showData['add_show_timezone'])
|
||||
);
|
||||
|
||||
@ -1055,8 +1056,9 @@ SQL;
|
||||
$showId = $this->ccShow->getDbId();
|
||||
// DateTime in show's local time
|
||||
$newStartDateTime = new DateTime(
|
||||
$showData['add_show_start_date'] . ' ' .
|
||||
$showData['add_show_start_time'],
|
||||
$showData['add_show_start_date']
|
||||
. ' '
|
||||
. $showData['add_show_start_time'],
|
||||
new DateTimeZone($showData['add_show_timezone'])
|
||||
);
|
||||
|
||||
@ -1333,10 +1335,9 @@ SQL;
|
||||
}
|
||||
|
||||
// We will only need this if the repeat type is MONTHLY_WEEKLY
|
||||
[$weekNumberOfMonth, $dayOfWeek] =
|
||||
self::getMonthlyWeeklyRepeatInterval(
|
||||
new DateTime($first_show, new DateTimeZone($timezone))
|
||||
);
|
||||
[$weekNumberOfMonth, $dayOfWeek] = self::getMonthlyWeeklyRepeatInterval(
|
||||
new DateTime($first_show, new DateTimeZone($timezone))
|
||||
);
|
||||
|
||||
$this->repeatType = $showDay->getDbRepeatType();
|
||||
|
||||
@ -1520,8 +1521,8 @@ SQL;
|
||||
$tempDT = clone $dt;
|
||||
$fifthWeekExists = false;
|
||||
do {
|
||||
$nextDT = date_create($weekNumberOfMonth . ' ' . $dayOfWeek .
|
||||
' of ' . $tempDT->format('F') . ' ' . $tempDT->format('Y'));
|
||||
$nextDT = date_create($weekNumberOfMonth . ' ' . $dayOfWeek
|
||||
. ' of ' . $tempDT->format('F') . ' ' . $tempDT->format('Y'));
|
||||
$nextDT->setTimezone(new DateTimeZone($timezone));
|
||||
|
||||
/* We have to check if the next date is in the same month in case
|
||||
@ -1918,8 +1919,8 @@ SQL;
|
||||
if (isset($offset)) {
|
||||
// $offset["hours"] and $offset["mins"] represents the start time
|
||||
// of a rebroadcast show
|
||||
$startDateTime = new DateTime($startDateTime->format('Y-m-d') . ' ' .
|
||||
$offset['hours'] . ':' . $offset['mins'], $timezone);
|
||||
$startDateTime = new DateTime($startDateTime->format('Y-m-d') . ' '
|
||||
. $offset['hours'] . ':' . $offset['mins'], $timezone);
|
||||
$startDateTime->add(new DateInterval("P{$offset['days']}D"));
|
||||
}
|
||||
|
||||
|
||||
@ -131,8 +131,8 @@ class AirtimeInstall
|
||||
} catch (Exception $e) {
|
||||
echo $e->getMessage() . PHP_EOL;
|
||||
echo 'Database connection problem.' . PHP_EOL;
|
||||
echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists" .
|
||||
' with corresponding permissions.' . PHP_EOL;
|
||||
echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists"
|
||||
. ' with corresponding permissions.' . PHP_EOL;
|
||||
if ($p_exitOnError) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"require-dev": {
|
||||
"php": "^7.4",
|
||||
"friendsofphp/php-cs-fixer": "<3.64.1"
|
||||
"friendsofphp/php-cs-fixer": "<3.85.2"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user