Skip to content
This repository has been archived by the owner on Aug 16, 2024. It is now read-only.

feat(branding): update crown logo to Tudor Crown logo in header #55

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions module/Olcs/view/layouts/base.phtml
Original file line number Diff line number Diff line change
@@ -162,12 +162,22 @@ $isLoggedIn = $currentUser->isLoggedIn();
<a href="/" title="<?php echo $this->escapeHtml($this->translate('go.to.dashboard')); ?>" class="govuk-header__link govuk-header__link--homepage">
<span class="govuk-header__logotype">
<!--[if gt IE 8]><!-->
<svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="30" width="36">
<path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
<svg
aria-hidden="true"
focusable="false"
class="govuk-header__logotype-crown"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 32 30"
height="30"
width="32"
>
<path
fill="currentColor" fill-rule="evenodd"
d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8"></path>
</svg>
<!--<![endif]-->
<!--[if IE 8]>
<img src="<?php echo $this->assetPath('/assets/images/govuk-logotype-crown.png'); ?>" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
<img src="<?php echo $this->assetPath('/assets/images/govuk-logotype-tudor-crown.png'); ?>" class="govuk-header__logotype-crown-fallback-image" width="32" height="30">
<![endif]-->
<span class="govuk-header__logotype-text">
GOV.UK

Unchanged files with check annotations Beta

),
'invokables' => array(
'generatePeopleList' => \Olcs\View\Helper\GeneratePeopleList::class,
'tmCheckAnswersChangeLink' => \Olcs\View\Helper\TmCheckAnswersChangeLink::class,

Check failure on line 1480 in module/Olcs/config/module.config.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedClass

module/Olcs/config/module.config.php:1480:43: UndefinedClass: Class, interface or enum named Olcs\View\Helper\TmCheckAnswersChangeLink does not exist (see https://psalm.dev/019)

Check failure on line 1480 in module/Olcs/config/module.config.php

GitHub Actions / static-analysis / PHPStan - 7.4

Class Olcs\View\Helper\TmCheckAnswersChangeLink not found.
)
),
'view_manager' => array(
* @var DataSourceInterface $source
* @var QueryInterface $query
*/
$source = new $dataSource();

Check failure on line 406 in module/Olcs/src/Controller/AbstractSelfserveController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedClass

module/Olcs/src/Controller/AbstractSelfserveController.php:406:23: UndefinedClass: Type array-key cannot be called as a class (see https://psalm.dev/019)
$query = $source->queryFromParams(array_merge($this->routeParams, $this->queryParams));
$response = $this->handleQuery($query);
$data = $this->mapperManager->get($mapper)->mapForDisplay($data);
}
$this->data[$source::DATA_KEY] = $data;

Check failure on line 417 in module/Olcs/src/Controller/AbstractSelfserveController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedConstant

module/Olcs/src/Controller/AbstractSelfserveController.php:417:25: UndefinedConstant: Constant Olcs\Controller\Config\DataSource\DataSourceInterface::DATA_KEY is not defined (see https://psalm.dev/020)
if (isset($config['append'])) {
foreach ($config['append'] as $appendTo => $mapper) {
$combinedData = [
$appendTo => $this->data[$appendTo],
$source::DATA_KEY => $data

Check failure on line 423 in module/Olcs/src/Controller/AbstractSelfserveController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedConstant

module/Olcs/src/Controller/AbstractSelfserveController.php:423:25: UndefinedConstant: Constant Olcs\Controller\Config\DataSource\DataSourceInterface::DATA_KEY is not defined (see https://psalm.dev/020)
];
$this->data[$appendTo] = $this->mapperManager->get($mapper)->mapForDisplay($combinedData);

Check failure on line 22 in module/Olcs/src/Controller/Cookie/SettingsController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedDocblockClass

module/Olcs/src/Controller/Cookie/SettingsController.php:22:14: UndefinedDocblockClass: Docblock-defined class, interface or enum named Olcs\Controller\Cookie\SetCookieGenerator does not exist (see https://psalm.dev/200)

Check failure on line 60 in module/Olcs/src/Controller/Cookie/SettingsController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedDocblockClass

module/Olcs/src/Controller/Cookie/SettingsController.php:60:28: UndefinedDocblockClass: Docblock-defined class, interface or enum named Olcs\Controller\Cookie\SetCookieGenerator does not exist (see https://psalm.dev/200)
/**
* don't need the navigation listener on the login page (and also need to prevent unauthenticated requests)
*/
if (!$instance instanceof LoginController) {

Check failure on line 24 in module/Olcs/src/Controller/Initializer/Navigation.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedClass

module/Olcs/src/Controller/Initializer/Navigation.php:24:35: UndefinedClass: Class, interface or enum named Dvsa\Olcs\Auth\Controller\LoginController does not exist (see https://psalm.dev/019)

Check failure on line 24 in module/Olcs/src/Controller/Initializer/Navigation.php

GitHub Actions / static-analysis / PHPStan - 7.4

Class Dvsa\Olcs\Auth\Controller\LoginController not found.
$navigationListener = $container->get(NavigationListener::class);
$instance->getEventManager()->attach(MvcEvent::EVENT_DISPATCH, [$navigationListener, 'onDispatch']);
}
/**
* getView
*
* @param Licence $licence

Check failure on line 130 in module/Olcs/src/Controller/Licence/Surrender/StartController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedDocblockClass

module/Olcs/src/Controller/Licence/Surrender/StartController.php:130:15: UndefinedDocblockClass: Docblock-defined class, interface or enum named Dvsa\Olcs\Api\Entity\Licence\Licence does not exist (see https://psalm.dev/200)
* @param Translator $translateService
*
* @return \Laminas\View\Model\ViewModel
/**
* @param Request $request
* @param RouteMatch $routeMatch
* @return Response|ResponseInterface|ViewModel

Check failure on line 153 in module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedDocblockClass

module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardController.php:153:16: UndefinedDocblockClass: Docblock-defined class, interface or enum named Olcs\Controller\Licence\Vehicle\Response does not exist (see https://psalm.dev/200)
* @throws \Exception
*/
protected function decisionAction(Request $request, RouteMatch $routeMatch)
* @param FormHelperService $formHelper
* @param TableFactory $tableBuilder
* @param MapperManager $mapperManager
* @param FlashMessenger $flashMessenger

Check failure on line 48 in module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleController.php

GitHub Actions / static-analysis / Psalm - 7.4

UndefinedClass

module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleController.php:48:15: UndefinedClass: Class, interface or enum named Laminas\Mvc\Controller\Plugin\FlashMessenger does not exist (see https://psalm.dev/019)
*/
public function __construct(
TranslationHelperService $translationHelper,
FormHelperService $formHelper,
TableFactory $tableBuilder,
MapperManager $mapperManager,
FlashMessenger $flashMessenger

Check failure on line 55 in module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleController.php

GitHub Actions / static-analysis / PHPStan - 7.4

Parameter $flashMessenger of method Olcs\Controller\Licence\Vehicle\ViewVehicleController::__construct() has invalid type Laminas\Mvc\Controller\Plugin\FlashMessenger.
) {
parent::__construct($translationHelper, $formHelper, $tableBuilder, $mapperManager, $flashMessenger);
}
return 'markup-licence-surrender-information-changed-content-expired';
}
if ($this->hasInformationChanged()) {

Check failure on line 102 in module/Olcs/src/Controller/Licence/Surrender/InformationChangedController.php

GitHub Actions / static-analysis / PHPStan - 7.4

Method Olcs\Controller\Licence\Surrender\InformationChangedController::getContent() should return string but return statement is missing.
return 'markup-licence-surrender-information-changed-content-changed';
}
}
for ($i = 0; $i < count($data['operatingCentres']); $i++) {
// process files for each operating centre
$this->operatingCentreId = $data['operatingCentres'][$i]['operatingCentre']['id'];

Check failure on line 130 in module/Olcs/src/Controller/Lva/AbstractUploadEvidenceController.php

GitHub Actions / static-analysis / PHPStan - 7.4

Access to an undefined property Olcs\Controller\Lva\AbstractUploadEvidenceController::$operatingCentreId.
$this->processFiles(
$form,
'operatingCentres->' . (string)$i . '->file',
{
$data = $this->getData();
foreach ($data['operatingCentres'] as $aocData) {
if ($aocData['operatingCentre']['id'] === $this->operatingCentreId) {

Check failure on line 167 in module/Olcs/src/Controller/Lva/AbstractUploadEvidenceController.php

GitHub Actions / static-analysis / PHPStan - 7.4

Access to an undefined property Olcs\Controller\Lva\AbstractUploadEvidenceController::$operatingCentreId.
$documents = $aocData['operatingCentre']['adDocuments'];
return array_filter($documents, function ($document) {
return $document['isPostSubmissionUpload'];
'isExternal' => $this->isExternal(),
'licence' => $this->getLicenceId(),
'application' => $this->getIdentifier(),
'operatingCentre' => $this->operatingCentreId,

Check failure on line 194 in module/Olcs/src/Controller/Lva/AbstractUploadEvidenceController.php

GitHub Actions / static-analysis / PHPStan - 7.4

Access to an undefined property Olcs\Controller\Lva\AbstractUploadEvidenceController::$operatingCentreId.
'isPostSubmissionUpload' => true
];