author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
95,144 |
09.10.2019 08:46:51
| -7,200 |
bb07517a4ddb370f9b2fc2c30433b56763707597
|
Working on using setcontent in backend
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -293,6 +293,8 @@ blocks:\nicon_many: \"fa:cubes\"\nicon_one: \"fa:cube\"\nsort: title\n+ records_per_page: 12\n+\n# This contenttype is here to use for (automated) tests.\ntests:\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/custom/setcontent_1.twig",
"new_path": "public/theme/skeleton/custom/setcontent_1.twig",
"diff": "</ul>\n<section>\n+ {# @todo: This doesn't work yet\n+ <section id=\"eight\">\n+ <h1>Eight</h1>\n+ {% setcontent entries = \"entries,blocks,showcases\" where {'title': '%voluptat% || %porro%' } printquery %}\n+ Results: <span id=\"results-six\">{{ entries|length > 0 ? 'yes' }}</span>\n+ <ul>\n+ {% for entry in entries %}\n+ <li>\n+ {{ entry.contenttype }} {{ entry.id }} . {{ entry|title }}\n+ </li>\n+ {% set last = entry.id %}\n+ {% endfor %}\n+ </ul>\n+ <section>\n+ #}\n+\n{% endblock main %}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentOverviewController.php",
"new_path": "src/Controller/Backend/ContentOverviewController.php",
"diff": "@@ -20,31 +20,11 @@ class ContentOverviewController extends TwigAwareController implements BackendZo\n/**\n* @Route(\"/content/{contentType}\", name=\"bolt_content_overview\")\n*/\n- public function overview(ContentRepository $contentRepository, Request $request, string $contentType = ''): Response\n+ public function overview(string $contentType = ''): Response\n{\n$contentType = ContentType::factory($contentType, $this->config->get('contenttypes'));\n- $page = (int) $request->query->get('page', 1);\n- $amountPerPage = $contentType->get('records_per_page', 10);\n-\n- if ($request->query->get('sort') && $request->query->get('filter') && $request->query->get('taxonomy')) {\n- $sortBy = $request->query->get('sort');\n- $filter = $request->query->get('filter');\n- $taxonomy = $request->query->get('taxonomy');\n-\n- $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy, $filter, $taxonomy);\n- } elseif ($request->query->get('sort')) {\n- $sortBy = $request->query->get('sort');\n- $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy, '');\n- } elseif ($request->query->get('filter')) {\n- $filter = $request->query->get('filter');\n- $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, '', $filter);\n- } else {\n- $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false);\n- }\n-\nreturn $this->renderTemplate('@bolt/content/listing.html.twig', [\n- 'records' => $records,\n'contentType' => $contentType,\n]);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/SelectQuery.php",
"new_path": "src/Storage/SelectQuery.php",
"diff": "@@ -310,6 +310,7 @@ class SelectQuery implements ContentQueryInterface\n*/\npublic function doFieldJoins(): void\n{\n+ $em = $this->qb->getEntityManager();\n$index = 1;\nforeach ($this->fieldJoins as $key => $filter) {\n$contentAlias = 'content_' . $index;\n@@ -318,32 +319,31 @@ class SelectQuery implements ContentQueryInterface\n$originalLeftExpression = 'content.' . $key;\n- [$newLeftExpression, $value] = JsonHelper::wrapJsonFunction($fieldsAlias . '.value', '', $this->qb);\n+ [$newLeftExpression, $dummyValue] = JsonHelper::wrapJsonFunction($fieldsAlias . '.value', '', $this->qb);\n$where = $filter->getExpression();\n$where = str_replace($originalLeftExpression, $newLeftExpression, $where);\n- $em = $this->qb->getEntityManager();\n-\n- $this->qb\n- ->andWhere(\n- $this->qb->expr()->in(\n- 'content.id',\n- $em\n+ // Create the subselect to filter on the value of fields\n+ $innerQuery = $em\n->createQueryBuilder()\n->select($contentAlias . '.id')\n->from(\\Bolt\\Entity\\Content::class, $contentAlias)\n->innerJoin($contentAlias . '.fields', $fieldsAlias)\n- ->andWhere($fieldsAlias . '.name = :' . $keyParam)\n- ->andWhere($where)\n- ->getDQL()\n- )\n- )\n- ->setParameter($keyParam, $key);\n+ ->andWhere($where);\n- foreach ($filter->getParameters() as $key => $value) {\n- [$newLeftExpression, $value] = JsonHelper::wrapJsonFunction('', $value, $this->qb);\n+ // Unless the field to which the 'where' applies is `anyColumn`, we\n+ // Make certain it's narrowed down to that fieldname\n+ if ($key != 'anyField') {\n+ $innerQuery->andWhere($fieldsAlias . '.name = :' . $keyParam);\n+ $this->qb->setParameter($keyParam, $key);\n+ }\n+\n+ $this->qb\n+ ->andWhere($this->qb->expr()->in('content.id', $innerQuery->getDQL()));\n+ foreach ($filter->getParameters() as $key => $value) {\n+ [$dummyKey, $value] = JsonHelper::wrapJsonFunction('', $value, $this->qb);\n$this->qb->setParameter($key, $value);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/listing.html.twig",
"new_path": "templates/content/listing.html.twig",
"diff": "{% extends '@bolt/_base/layout.html.twig' %}\n{% import '@bolt/_macro/_macro.html.twig' as macro %}\n+\n+{% set whereValues = {'status': '!unknown'} %}\n+{% set sortBy = app.request.get('sortBy')|default() %}\n+{% set taxonomy = app.request.get('taxonomy')|default() %}\n+{% set filterValue = app.request.get('filter')|default() %}\n+{% if filterValue %}\n+ {% set whereValues = whereValues|merge({'anyField': '%' ~ filterValue ~ '%' }) %}\n+{% endif %}\n+\n{# The 'title' and 'shoulder' blocks are the main heading of the page. #}\n{% block shoulder %}\n{{ 'listing.title_overview'|trans }}\n{# This 'topsection' gets output _before_ the main form, allowing `dump()`, without breaking Vue #}\n{% block topsection %}\n+ {{ dump(sortBy) }}\n+ {{ dump(contentType) }}\n+ {{ dump(whereValues) }}\n{% endblock %}\n{% block main %}\n+\n+ {% setcontent records = 'blocks' orderby sortBy printquery where whereValues limit contentType.records_per_page %}\n+\n<div>\n{% include '@bolt/_partials/_content_listing.html.twig' with {'records': records, 'type': contentType.slug } %}\n</div>\n'id': \"Id\", 'title': 'Title', 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date',\n'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'\n} %}\n- {% set sortBy = app.request.get('sort')|default() %}\n- {% set taxonomy = app.request.get('taxonomy')|default() %}\n- {% set filterValue = app.request.get('filter')|default() %}\n+\n<div class=\"card\">\n<div class=\"card-header\">\n{{ 'title.contentlisting'|trans }}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on using setcontent in backend
|
95,144 |
09.10.2019 20:09:13
| -7,200 |
275ac29129b03bd0af462d53c489684cb465bc2e
|
Only add preset fixtures on first run, not on consecutive ones
|
[
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/BaseFixture.php",
"new_path": "src/DataFixtures/BaseFixture.php",
"diff": "@@ -90,4 +90,9 @@ abstract class BaseFixture extends Fixture\nreturn $finder;\n}\n+\n+ protected function getOption(string $name): bool\n+ {\n+ return in_array($name, $_SERVER['argv'], true);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -24,6 +24,7 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n/** @var Generator */\nprivate $faker;\n+ /** @var string */\nprivate $lastTitle = null;\n/** @var array */\n@@ -75,6 +76,11 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n$translationRepository = $manager->getRepository(Translation::class);\nforeach ($this->config->get('contenttypes') as $contentType) {\n+ // Only add Singletons on first run, not when appending\n+ if ($this->getOption('--append') && $contentType['singleton']) {\n+ continue;\n+ }\n+\n$amount = $contentType['singleton'] ? 1 : (int) ($contentType['listing_records'] * 3);\nfor ($i = 1; $i <= $amount; $i++) {\n@@ -238,7 +244,7 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\nprivate function getPreset(string $slug): array\n{\n- if (isset($this->presetRecords[$slug]) && ! empty($this->presetRecords[$slug])) {\n+ if (isset($this->presetRecords[$slug]) && ! empty($this->presetRecords[$slug]) && ! $this->getOption('--append')) {\n$preset = array_shift($this->presetRecords[$slug]);\n} else {\n$preset = [];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/TaxonomyFixtures.php",
"new_path": "src/DataFixtures/TaxonomyFixtures.php",
"diff": "@@ -23,6 +23,10 @@ class TaxonomyFixtures extends BaseFixture implements FixtureGroupInterface\npublic function load(ObjectManager $manager): void\n{\n+ if ($this->getOption('--append')) {\n+ return;\n+ }\n+\n$this->loadTaxonomies($manager);\n$manager->flush();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/UserFixtures.php",
"new_path": "src/DataFixtures/UserFixtures.php",
"diff": "@@ -29,7 +29,7 @@ class UserFixtures extends BaseFixture implements FixtureGroupInterface\n$this->passwordEncoder = $passwordEncoder;\n// If ran with `--append` we append users, and use random passwords for them\n- if (in_array('--append', $_SERVER['argv'], true)) {\n+ if ($this->getOption('--append')) {\n$this->append = true;\n}\n$this->users = $users;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Only add preset fixtures on first run, not on consecutive ones
|
95,144 |
09.10.2019 21:35:39
| -7,200 |
41fb43be882b88aebb42467297ff296bbfa9a44d
|
Working some mo'
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/DashboardController.php",
"new_path": "src/Controller/Backend/DashboardController.php",
"diff": "@@ -8,6 +8,7 @@ use Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n+use Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n@@ -19,12 +20,13 @@ class DashboardController extends TwigAwareController implements BackendZone\n/**\n* @Route(\"/\", name=\"bolt_dashboard\", methods={\"GET\"})\n*/\n- public function index(ContentRepository $content): Response\n+ public function index(ContentRepository $content, Request $request): Response\n{\n$amount = $this->config->get('general/records_per_page', 10);\n+ $page = (int) $request->get('page', 1);\n/** @var Content $records */\n- $records = $content->findLatest(null, $amount);\n+ $records = $content->findLatest(null, $page, $amount);\nreturn $this->renderTemplate('@bolt/pages/dashboard.html.twig', [\n'records' => $records,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/GeneralController.php",
"new_path": "src/Controller/Backend/GeneralController.php",
"diff": "@@ -44,7 +44,7 @@ class GeneralController extends TwigAwareController implements BackendZone\npublic function kitchensink(ContentRepository $content): Response\n{\n/** @var Content $records */\n- $records = $content->findLatest(null, 4);\n+ $records = $content->findLatest(null, 1, 4);\n$this->addFlash('success', '<strong>Well done!</strong> You successfully read this important alert message.');\n$this->addFlash('info', '<strong>Heads up!</strong> This alert needs your attention, but it\\'s not super important.');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Menu/BackendMenuBuilder.php",
"new_path": "src/Menu/BackendMenuBuilder.php",
"diff": "@@ -294,7 +294,7 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\nprivate function getLatestRecords(ContentType $contentType): array\n{\n- $records = $this->contentRepository->findLatest($contentType, self::MAX_LATEST_RECORDS);\n+ $records = $this->contentRepository->findLatest($contentType, 1, self::MAX_LATEST_RECORDS);\n$result = [];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -167,7 +167,7 @@ class ContentRepository extends ServiceEntityRepository\n/**\n* @return Content[]\n*/\n- public function findLatest(?ContentType $contentType = null, int $amount = 6): array\n+ public function findLatest(?ContentType $contentType = null, int $page = 1, int $amount = 6): Pagerfanta\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -181,7 +181,7 @@ class ContentRepository extends ServiceEntityRepository\n$qb->setMaxResults($amount);\n- return $qb->getQuery()->getResult();\n+ return $this->createPaginator($qb->getQuery(), $page, $amount);\n}\npublic function searchNaive(string $searchTerm, int $page, int $amountPerPage, bool $onlyPublished = true): Pagerfanta\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/listing.html.twig",
"new_path": "templates/content/listing.html.twig",
"diff": "<div class=\"card-body\">\n<form>\n<div class=\"form-group\">\n-{# Needs more work #}\n-{# <p>#}\n-{# <strong>{{ 'listing.title_sortby'|trans }}</strong>:#}\n-{# <select class=\"form-control\" name=\"sort\">#}\n-{# <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>#}\n-{# {{ 'listing.option_select_item'|trans }}#}\n-{# </option>#}\n-{# {% for key, filterOption in filterOptions %}#}\n-{# <option value=\"{{ key }}\" {% if sortBy == key %}selected{% endif %}>#}\n-{# {{ filterOption }}#}\n-{# </option>#}\n-{# {% endfor %}#}\n-{# </select>#}\n-{# </p>#}\n-{# {% if contentType.get('taxonomy') %}#}\n-{# <p>#}\n-{# <strong>{{ 'listing.title_taxonomy'|trans }}</strong>:#}\n-{# <select class=\"form-control\" name=\"taxonomy\">#}\n-{# <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>#}\n-{# {{ 'listing.option_select_item'|trans }}#}\n-{# </option>#}\n-{# {% for taxonomy in contentType.get('taxonomy') %}#}\n-{# {% set taxonomyDefinition = config.get('taxonomies/' ~ taxonomy) %}#}\n-{# {% for key, taxonomyValue in taxonomyDefinition.options %}#}\n-{# <option value=\"{{ key }}\" {% if taxonomy == key %}selected{% endif %}>#}\n-{# {{ taxonomyValue }}#}\n-{# </option>#}\n-{# {% endfor %}#}\n-{# {% endfor %}#}\n-{# </select>#}\n-{# </p>#}\n-{# {% endif %}#}\n+\n+ <p>\n+ <strong>{{ 'listing.title_sortby'|trans }}</strong>:\n+ <select class=\"form-control\" name=\"sortBy\">\n+ <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n+ {{ 'listing.option_select_item'|trans }}\n+ </option>\n+ {% for key, filterOption in filterOptions %}\n+ <option value=\"{{ key }}\" {% if sortBy == key %}selected{% endif %}>\n+ {{ filterOption }}\n+ </option>\n+ {% endfor %}\n+ </select>\n+ </p>\n+ {% if contentType.get('taxonomy') %}\n+ <p>\n+ <strong>{{ 'listing.title_taxonomy'|trans }}</strong>:\n+ <select class=\"form-control\" name=\"taxonomy\">\n+ <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n+ {{ 'listing.option_select_item'|trans }}\n+ </option>\n+ {% for taxonomy in contentType.get('taxonomy') %}\n+ {% set taxonomyDefinition = config.get('taxonomies/' ~ taxonomy) %}\n+ {% for key, taxonomyValue in taxonomyDefinition.options %}\n+ <option value=\"{{ key }}\" {% if taxonomy == key %}selected{% endif %}>\n+ {{ taxonomyValue }}\n+ </option>\n+ {% endfor %}\n+ {% endfor %}\n+ </select>\n+ </p>\n+ {% endif %}\n<p>\n<strong>{{ 'listing.title_title'|trans }}</strong>:\n<input class=\"form-control\" type=\"text\" name=\"filter\" value=\"{{ filterValue }}\"\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working some mo'
|
95,144 |
10.10.2019 08:37:25
| -7,200 |
a49848156b8c2e1b324f39361f44aeac1c1f4441
|
"Fixing" the weird-ass Voodo shit that is PHPSpec
|
[
{
"change_type": "MODIFY",
"old_path": "tests/spec/Bolt/Menu/BackendMenuBuilderSpec.php",
"new_path": "tests/spec/Bolt/Menu/BackendMenuBuilderSpec.php",
"diff": "@@ -54,6 +54,9 @@ class BackendMenuBuilderSpec extends ObjectBehavior\nItemInterface $item,\nItemInterface $subitem\n) {\n+\n+ // Seriously, what kind of weird-ass Voodoo shit is this PHPSpec?\n+ /**\n$contentExtension->getTitle($content)\n->shouldBeCalled()\n->willReturn(self::TEST_TITLE);\n@@ -63,9 +66,10 @@ class BackendMenuBuilderSpec extends ObjectBehavior\n$contentExtension->getEditLink($content)\n->shouldBeCalled()\n->willReturn('/bolt/edit-by-slug/'.self::TEST_SLUG);\n+ */\n$contentRepository->findLatest($contentType, 1, BackendMenuBuilder::MAX_LATEST_RECORDS)\n- ->shouldBeCalled();\n-// ->willReturn(new Pagerfanta(new ArrayAdapter([])));\n+ ->shouldBeCalled()\n+ ->willReturn(new Pagerfanta(new ArrayAdapter([])));\n$contentType->getSlug()->willReturn(self::TEST_SLUG);\n$contentType->offsetGet(Argument::type('string'))->shouldBeCalled();\n@@ -83,7 +87,6 @@ class BackendMenuBuilderSpec extends ObjectBehavior\n$subitem->getLabel()->shouldBeCalled();\n$subitem->getUri()->shouldBeCalled();\n-\n$menuFactory->createItem('root')->willReturn($item);\n$this->buildAdminMenu();\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
"Fixing" the weird-ass Voodo shit that is PHPSpec
|
95,144 |
11.10.2019 18:26:58
| -7,200 |
3d9c16b43dbed3bde376e8d951bb6353746bcfd5
|
More work done.
|
[
{
"change_type": "DELETE",
"old_path": "assets/scss/modules/base/_pagination.scss",
"new_path": null,
"diff": "-//** Base | Pagination\n-\n-.pagination {\n- margin: 0 auto;\n-\n- nav {\n- display: flex;\n-\n- span,\n- a {\n- font-size: 0.875rem;\n- display: flex;\n- align-items: center;\n- justify-content: center;\n- background: var(--foreground);\n- border-radius: $border-radius;\n- box-shadow: $card-box-shadow;\n- padding: $spacer*0.4 $spacer*0.5;\n- margin-right: $spacer*0.5;\n- min-width: 34px;\n- letter-spacing: $letter-spacing;\n- border: 1px solid var(--foreground-border);\n-\n- &:last-child {\n- margin-right: 0;\n- }\n-\n- &.disabled {\n- color: $disabled;\n-\n- &:hover {\n- background: var(--foreground);\n- }\n- }\n-\n- &.current {\n- color: var(--foreground);\n- background: var(--primary);\n- font-weight: $font-weight-bold;\n-\n- &:hover {\n- background: var(--primary);\n- }\n- }\n-\n- &:hover {\n- text-decoration: none;\n- background: var(--background);\n- }\n-\n- &:focus {\n- outline: none;\n- box-shadow: $input-btn-focus-box-shadow;\n- }\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/base/base.scss",
"new_path": "assets/scss/modules/base/base.scss",
"diff": "//** Base Modules\n@import '_status';\n-@import '_pagination';\n@import '_notification';\n@import '_buttons';\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/listing/_filter.scss",
"new_path": "assets/scss/modules/listing/_filter.scss",
"diff": "margin-bottom: $spacer;\n}\n- .pagination {\n- nav {\n- height: 100%;\n- }\n- }\n&--controls {\nflex: 1 1 100%;\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"new_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"diff": "@import \"~bootstrap/scss/modal\";\n@import \"~bootstrap/scss/close\";\n@import \"~bootstrap/scss/progress\";\n+@import \"~bootstrap/scss/pagination\";\n@import \"~bootstrap/scss/nav\";\n@import \"~bootstrap/scss/tooltip\";\n@import \"~bootstrap/scss/toasts\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/SelectQuery.php",
"new_path": "src/Storage/SelectQuery.php",
"diff": "@@ -312,9 +312,7 @@ class SelectQuery implements ContentQueryInterface\n{\n$em = $this->qb->getEntityManager();\n-\nforeach ($this->fieldJoins as $key => $filter) {\n-\n$index = $this->getAndIncrementIndex();\n$contentAlias = 'content_' . $index;\n$fieldsAlias = 'fields_' . $index;\n@@ -350,9 +348,6 @@ class SelectQuery implements ContentQueryInterface\n$this->qb->setParameter($key, $value);\n}\n}\n-\n- dump($this->qb->getParameters());\n-\n}\npublic function setContentTypeFilter(array $contentTypes): void\n@@ -380,8 +375,6 @@ class SelectQuery implements ContentQueryInterface\npublic function getAndIncrementIndex()\n{\n- return rand(1000, 9999);\n-\n$this->incrementIndex();\nreturn $this->getIndex();\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/_content_listing.html.twig",
"new_path": "templates/_partials/_content_listing.html.twig",
"diff": "-{% if records %}\n+{% if records|length %}\n+\n<!-- listing records -->\n<listing-records\ntype=\"{{ type }}\"\n}|json_encode }}\"\n></listing-table>\n- <div class=\"listing__filter\">\n- {{ pager(records, template = '@bolt/helpers/_pager_bootstrap.html.twig') }}\n- </div>\n+ {{ pager(records, template = '@bolt/helpers/_pager_bootstrap.html.twig', class=\"justify-content-center\") }}\n+\n{% else %}\n- (no content)\n+ <div class=\"alert alert-warning\" role=\"alert\">\n+ {{ __('listing_table.no_results') }}\n+ </div>\n+\n{% endif %}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<target>Content Type</target>\n</segment>\n</unit>\n+ <unit id=\"TSkqRw3\" name=\"listing.title_taxonomy\">\n+ <segment>\n+ <source>listing.title_taxonomy</source>\n+ <target>Taxonomy</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"Hr2E9Oa\" name=\"listing_table.no_results\">\n+ <segment>\n+ <source>listing_table.no_results</source>\n+ <target>No results found. Broaden the filtering criteria, or add some more content.</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
More work done.
|
95,144 |
15.10.2019 17:27:20
| -7,200 |
a6ea3497bd0da6ef66b7163b0d38a428e3118d38
|
Refactor ContentQueryInterface to QueryInterface
|
[
{
"change_type": "DELETE",
"old_path": "src/Storage/ContentQueryInterface.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Storage;\n-\n-interface ContentQueryInterface extends QueryInterface\n-{\n- /**\n- * Returns the content type this query is executing on.\n- */\n- public function getContentType(): string;\n-\n- /**\n- * Returns the value of a parameter by key name.\n- */\n- public function getParameter(string $key);\n-\n- /**\n- * Sets the value of a parameter by key name.\n- */\n- public function setParameter(string $key, $value): void;\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/ContentQueryParser.php",
"new_path": "src/Storage/ContentQueryParser.php",
"diff": "@@ -237,7 +237,7 @@ class ContentQueryParser\n$this->scope = $scope;\n}\n- public function runScopes(ContentQueryInterface $query): void\n+ public function runScopes(QueryInterface $query): void\n{\nif ($this->scope !== null) {\n$this->scope->onQueryExecute($query);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/FrontendQueryScope.php",
"new_path": "src/Storage/FrontendQueryScope.php",
"diff": "@@ -34,7 +34,7 @@ class FrontendQueryScope implements QueryScopeInterface\n/**\n* Get the default order setting for a given content type.\n*/\n- public function getOrder(ContentQueryInterface $query): string\n+ public function getOrder(QueryInterface $query): string\n{\n$contentType = $query->getContentType();\n@@ -61,7 +61,7 @@ class FrontendQueryScope implements QueryScopeInterface\n}\n}\n- public function onQueryExecute(ContentQueryInterface $query): void\n+ public function onQueryExecute(QueryInterface $query): void\n{\nif (empty($query->getQueryBuilder()->getParameter('orderBy'))) {\n$handler = new OrderDirective();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/QueryInterface.php",
"new_path": "src/Storage/QueryInterface.php",
"diff": "@@ -29,4 +29,19 @@ interface QueryInterface\npublic function getIndex(): int;\npublic function incrementIndex(): void;\n+\n+ /**\n+ * Returns the content type this query is executing on.\n+ */\n+ public function getContentType(): string;\n+\n+ /**\n+ * Returns the value of a parameter by key name.\n+ */\n+ public function getParameter(string $key);\n+\n+ /**\n+ * Sets the value of a parameter by key name.\n+ */\n+ public function setParameter(string $key, $value): void;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/QueryScopeInterface.php",
"new_path": "src/Storage/QueryScopeInterface.php",
"diff": "@@ -12,5 +12,5 @@ namespace Bolt\\Storage;\n*/\ninterface QueryScopeInterface\n{\n- public function onQueryExecute(ContentQueryInterface $query);\n+ public function onQueryExecute(QueryInterface $query);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Storage/SelectQuery.php",
"new_path": "src/Storage/SelectQuery.php",
"diff": "@@ -20,7 +20,7 @@ use Doctrine\\ORM\\QueryBuilder;\n*\n* @author Ross Riley <riley.ross@gmail.com>\n*/\n-class SelectQuery implements ContentQueryInterface\n+class SelectQuery implements QueryInterface\n{\n/** @var QueryBuilder */\nprotected $qb;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Refactor ContentQueryInterface to QueryInterface
|
95,144 |
16.10.2019 17:22:25
| -7,200 |
be67ec21cc2b4ade8a63add1c59796cfd6d50022
|
When persisting a Content, make sure the `modifiedAt` is updated
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -285,6 +285,15 @@ class Content\nreturn $this;\n}\n+ /**\n+ * @ORM\\PrePersist()\n+ * @ORM\\PreUpdate()\n+ */\n+ public function updateModifiedAt()\n+ {\n+ $this->setModifiedAt(new \\DateTime());\n+ }\n+\npublic function getPublishedAt(): ?\\DateTime\n{\nreturn $this->publishedAt;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
When persisting a Content, make sure the `modifiedAt` is updated
|
95,144 |
16.10.2019 17:25:41
| -7,200 |
446266b01b0d01ba8066510883228619419d95b2
|
Tidy up `findForListing`
|
[
{
"change_type": "MODIFY",
"old_path": "src/Repository/ContentRepository.php",
"new_path": "src/Repository/ContentRepository.php",
"diff": "@@ -36,7 +36,7 @@ class ContentRepository extends ServiceEntityRepository\nreturn $this->createQueryBuilder('content');\n}\n- public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '', string $filter = '', string $taxonomy = ''): Pagerfanta\n+ public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true): Pagerfanta\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -52,25 +52,14 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('status', Statuses::PUBLISHED);\n}\n- if (! empty($sortBy) || ! empty($filter)) {\n- $qb->addSelect('f')\n- ->innerJoin('content.fields', 'f');\n- }\n-\n- if ($taxonomy) {\n- $qb->addSelect('t')\n- ->innerJoin('content.taxonomies', 't')\n- ->andWhere('slug', ':taxonomySlug')\n- ->setParameter('taxonomySlug', $taxonomy);\n- }\n-\n- [ $order, $direction, $sortByField ] = $this->createSortBy($sortBy, $contentType);\n+ [ $order, $direction, $sortByField ] = $this->createSortBy($contentType);\nif (! $sortByField) {\n$qb->orderBy('content.' . $order, $direction);\n} else {\n// @todo Make sorting on a Field work as expected.\ndump('This is not correct');\n+\n// First, create a querybuilder to get the fields that match the Query\n$sortByQB = $this->getQueryBuilder()\n->select('partial content.{id}');\n@@ -88,55 +77,9 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('ids', $ids);\n}\n- if ($filter) {\n- // First, create a querybuilder to get the fields that match the Query\n- $filterQB = $this->getQueryBuilder()\n- ->select('partial content.{id}');\n-\n- $filterQB->addSelect('f')\n- ->innerJoin('content.fields', 'f')\n- ->andWhere($filterQB->expr()->like('f.value', ':filterValue'))\n- ->setParameter('filterValue', '%' . $filter . '%');\n-\n- // These are the ID's of content we need.\n- $ids = array_column($filterQB->getQuery()->getArrayResult(), 'id');\n-\n- $qb->andWhere('content.id IN (:ids)')\n- ->setParameter('ids', $ids);\n- }\n-\nreturn $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n}\n- /**\n- * Cobble together the sorting order, and whether or not it's a column in `content` or `fields`.\n- */\n- private function createSortBy(string $order, Collection $contentType): array\n- {\n- if (empty($order)) {\n- $order = $contentType->get('sort', '');\n- }\n-\n- if (mb_strpos($order, '-') === 0) {\n- $direction = 'DESC';\n- $order = mb_substr($order, 1);\n- } elseif (mb_strpos($order, ' DESC') !== false) {\n- $direction = 'DESC';\n- $order = str_replace(' DESC', '', $order);\n- } else {\n- $order = str_replace(' ASC', '', $order);\n- $direction = 'ASC';\n- }\n-\n- if (\\in_array($order, $this->contentColumns, true)) {\n- $sortByField = false;\n- } else {\n- $sortByField = true;\n- }\n-\n- return [$order, $direction, $sortByField];\n- }\n-\npublic function findForTaxonomy(int $page, Collection $taxonomy, string $slug, int $amountPerPage, bool $onlyPublished = true): Pagerfanta\n{\n$qb = $this->getQueryBuilder()\n@@ -155,7 +98,7 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('status', Statuses::PUBLISHED);\n}\n- [ $order, $direction, $sortByField ] = $this->createSortBy('', $taxonomy);\n+ [ $order, $direction, $sortByField ] = $this->createSortBy($taxonomy);\nif (! $sortByField) {\n$qb->orderBy('content.' . $order, $direction);\n@@ -176,6 +119,8 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('ct', $contentType->getSlug());\n}\n+ $qb->orderBy('content.modifiedAt', 'DESC');\n+\n$qb->setMaxResults($amount);\nreturn $this->createPaginator($qb->getQuery(), $page, $amount);\n@@ -288,4 +233,31 @@ class ContentRepository extends ServiceEntityRepository\nreturn $qb->getQuery()->getOneOrNullResult();\n}\n+\n+ /**\n+ * Cobble together the sorting order, and whether or not it's a column in `content` or `fields`.\n+ */\n+ private function createSortBy(Collection $contentType): array\n+ {\n+ $order = $contentType->get('sort', '');\n+\n+ if (mb_strpos($order, '-') === 0) {\n+ $direction = 'DESC';\n+ $order = mb_substr($order, 1);\n+ } elseif (mb_strpos($order, ' DESC') !== false) {\n+ $direction = 'DESC';\n+ $order = str_replace(' DESC', '', $order);\n+ } else {\n+ $order = str_replace(' ASC', '', $order);\n+ $direction = 'ASC';\n+ }\n+\n+ if (\\in_array($order, $this->contentColumns, true)) {\n+ $sortByField = false;\n+ } else {\n+ $sortByField = true;\n+ }\n+\n+ return [$order, $direction, $sortByField];\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/RecordExtension.php",
"new_path": "src/Twig/RecordExtension.php",
"diff": "@@ -154,11 +154,10 @@ class RecordExtension extends AbstractExtension\n}\n$contentType = ContentType::factory($contentTypeSlug, $this->config->get('contenttypes'));\n-\n$maxAmount = $this->config->get('maximum_listing_select', 1000);\n/** @var Content[] $records */\n- $records = $this->contentRepository->findForListing(1, $maxAmount, $contentType);\n+ $records = $this->contentRepository->findForListing(1, $maxAmount, $contentType, false);\nforeach ($records as $record) {\n$options[] = [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/RelatedExtension.php",
"new_path": "src/Twig/RelatedExtension.php",
"diff": "@@ -126,7 +126,9 @@ class RelatedExtension extends AbstractExtension\npublic function getRelatedOptions(string $contentType): Collection\n{\n$contentType = ContentType::factory($contentType, $this->config->get('contenttypes'));\n- $content = $this->contentRepository->findForListing(1, 1000, $contentType, false);\n+ $maxAmount = $this->config->get('maximum_listing_select', 1000);\n+\n+ $content = $this->contentRepository->findForListing(1, $maxAmount, $contentType, false);\n$options = [];\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tidy up `findForListing`
|
95,144 |
16.10.2019 17:34:43
| -7,200 |
03dbcdd137676e5fe401f1db80b82a1c73e27395
|
Adding return type hint
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -289,7 +289,7 @@ class Content\n* @ORM\\PrePersist()\n* @ORM\\PreUpdate()\n*/\n- public function updateModifiedAt()\n+ public function updateModifiedAt(): void\n{\n$this->setModifiedAt(new \\DateTime());\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Adding return type hint
|
95,192 |
17.10.2019 17:46:31
| -7,200 |
b6966ed63d93602ed13734aa55cc8db2317c9bc4
|
redo style on login page, use body classes iso html classes and id, add logo version when bg images enabled
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/_login.scss",
"new_path": "assets/scss/layout/_login.scss",
"diff": "-html#login {\n- background: linear-gradient(rgba(0, 0, 0, 0.4), rgba(37, 86, 135, 0.5));\n+.page--login {\n- &.with-background {\n- background: linear-gradient(rgba(0, 0, 0, 0.4), rgba(37, 86, 135, 0.5)), url(https://source.unsplash.com/daily);\n- background-position: center;\n- background-size: cover;\n+ > div {\n+ max-width: 25rem;\n+ margin: 0 auto;\n+ padding: 2rem 1rem;\n+ @include media-breakpoint-up(sm) {\n+ padding-top: 4rem;\n+ }\n+ @include media-breakpoint-up(md) {\n+ padding-top: 5rem;\n+ }\n+ @include media-breakpoint-up(lg) {\n+ padding-top: 7rem;\n+ }\n+ }\n+\n+ h1 {\n+ text-align: center;\n+ margin: 2rem 0;\n+ font-size: 1.25rem;\n}\nbody {\n@@ -14,18 +28,31 @@ html#login {\nalign-items: center;\n}\n- .card {\n- width: 22rem;\n- box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.4);\n+ .login__login-form {\n+ .card-body {\n+ padding: 1rem;\n+ }\n+ .form-check-label {\n+ font-weight: 400;\n+ }\n}\n- .logo {\n- width: 22rem;\n+ .login__logo {\n+ padding: 0 2rem;\n+ img {\n+ max-width: 100%;\n+ display: block;\n+ }\n}\n+ &.with-background {\n+ background-image: url(https://source.unsplash.com/daily);\n+ background-position: center;\n+ background-size: cover;\nh1 {\n- color: #fff;\n- text-align: center;\n- margin: 2rem 0;\n+ color: $white;\n+ text-shadow: 0px 1px 1px var(--shade);\n}\n}\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/static/images/bolt_logo_loginpage--bg.svg",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<svg width=\"1116px\" height=\"256px\" viewBox=\"0 0 1116 256\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n+ <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->\n+ <title>bolt_logo_login</title>\n+ <desc>Created with Sketch.</desc>\n+ <defs>\n+ <path d=\"M0.992,158.667 L55.442,158.667 C87.167,158.667 112.367,145.392 112.367,115.467 C112.367,95.892 100.892,84.867 86.042,81.042 L86.042,80.142 C97.967,75.642 105.167,61.467 105.167,48.417 C105.167,20.292 81.542,11.967 51.167,11.967 L0.992,11.967 L0.992,158.667 Z M34.067,70.692 L34.067,37.617 L49.817,37.617 C65.342,37.617 72.767,41.892 72.767,53.367 C72.767,63.942 65.792,70.692 49.592,70.692 L34.067,70.692 Z M34.067,133.017 L34.067,95.217 L52.742,95.217 C70.967,95.217 79.967,100.392 79.967,113.217 C79.967,126.717 70.742,133.017 52.742,133.017 L34.067,133.017 Z M182.342,161.367 C210.467,161.367 236.567,139.992 236.567,102.867 C236.567,65.742 210.467,44.367 182.342,44.367 C153.992,44.367 127.892,65.742 127.892,102.867 C127.892,139.992 153.992,161.367 182.342,161.367 Z M182.342,134.592 C168.617,134.592 161.867,122.217 161.867,102.867 C161.867,83.517 168.617,71.142 182.342,71.142 C195.842,71.142 202.817,83.517 202.817,102.867 C202.817,122.217 195.842,134.592 182.342,134.592 Z M289.667,161.367 C297.092,161.367 302.717,160.242 306.317,158.667 L302.267,134.142 C300.467,134.592 299.567,134.592 298.217,134.592 C295.517,134.592 292.367,132.342 292.367,125.367 L292.367,0.942 L259.292,0.942 L259.292,124.017 C259.292,146.517 266.942,161.367 289.667,161.367 Z M366.617,161.367 C377.417,161.367 385.517,159.117 391.367,157.317 L386.192,133.242 C383.267,134.367 379.217,135.492 375.617,135.492 C366.842,135.492 361.217,130.317 361.217,117.717 L361.217,72.942 L387.992,72.942 L387.992,47.067 L361.217,47.067 L361.217,17.367 L333.767,17.367 L329.942,47.067 L312.842,48.417 L312.842,72.942 L328.142,72.942 L328.142,118.167 C328.142,144.042 338.942,161.367 366.617,161.367 L366.617,161.367 Z\" id=\"path-1\"></path>\n+ <filter x=\"-1.3%\" y=\"-2.5%\" width=\"102.6%\" height=\"106.2%\" filterUnits=\"objectBoundingBox\" id=\"filter-2\">\n+ <feOffset dx=\"0\" dy=\"1\" in=\"SourceAlpha\" result=\"shadowOffsetOuter1\"></feOffset>\n+ <feGaussianBlur stdDeviation=\"1.5\" in=\"shadowOffsetOuter1\" result=\"shadowBlurOuter1\"></feGaussianBlur>\n+ <feColorMatrix values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0\" type=\"matrix\" in=\"shadowBlurOuter1\"></feColorMatrix>\n+ </filter>\n+ <path d=\"M467.167,161.367 C483.817,161.367 495.067,154.617 503.392,148.542 L493.042,133.242 C487.417,137.742 480.667,141.792 472.117,141.792 C457.267,141.792 449.842,132.117 449.842,115.467 C449.842,88.017 467.167,65.067 486.967,65.067 C494.392,65.067 498.892,67.767 504.067,73.617 L517.567,58.992 C511.492,51.792 502.042,45.492 488.542,45.492 C454.117,45.492 425.092,76.767 425.092,116.367 C425.092,144.942 442.867,161.367 467.167,161.367 L467.167,161.367 Z M521.392,158.667 L545.692,158.667 L560.542,83.292 C571.567,71.367 581.017,66.192 586.867,66.192 C595.642,66.192 600.142,70.917 600.142,80.367 C600.142,83.742 599.467,86.892 598.342,92.067 L585.067,158.667 L609.142,158.667 L624.217,83.292 C635.467,71.367 644.917,66.192 650.542,66.192 C659.542,66.192 664.042,70.917 664.042,80.367 C664.042,83.742 663.367,86.892 662.242,92.067 L648.742,158.667 L673.042,158.667 L686.992,88.917 C688.117,83.067 688.792,78.567 688.792,73.392 C688.792,55.617 680.917,45.492 662.692,45.492 C650.767,45.492 637.492,53.592 624.442,65.967 C622.192,54.042 615.892,45.492 598.792,45.492 C586.867,45.492 574.042,53.817 562.792,63.717 L561.892,63.717 L563.017,48.192 L543.442,48.192 L521.392,158.667 Z M736.717,161.367 C762.142,161.367 780.592,147.417 780.592,126.042 C780.592,112.542 772.492,103.767 756.067,94.992 C746.617,89.592 737.167,85.767 737.167,77.667 C737.167,70.017 744.592,63.717 754.717,63.717 C763.492,63.717 770.242,68.442 775.867,74.067 L789.367,61.242 C780.817,52.242 769.117,45.492 754.717,45.492 C732.667,45.492 714.442,59.892 714.442,79.917 C714.442,93.192 723.442,102.417 738.067,110.517 C752.017,118.167 757.867,121.992 757.867,128.967 C757.867,137.067 748.867,143.367 738.517,143.367 C728.617,143.367 719.617,137.967 712.417,128.517 L698.017,140.217 C706.342,152.817 722.767,161.367 736.717,161.367 L736.717,161.367 Z\" id=\"path-3\"></path>\n+ <filter x=\"-1.4%\" y=\"-3.5%\" width=\"102.7%\" height=\"108.6%\" filterUnits=\"objectBoundingBox\" id=\"filter-4\">\n+ <feOffset dx=\"0\" dy=\"1\" in=\"SourceAlpha\" result=\"shadowOffsetOuter1\"></feOffset>\n+ <feGaussianBlur stdDeviation=\"1.5\" in=\"shadowOffsetOuter1\" result=\"shadowBlurOuter1\"></feGaussianBlur>\n+ <feColorMatrix values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0\" type=\"matrix\" in=\"shadowBlurOuter1\"></feColorMatrix>\n+ </filter>\n+ </defs>\n+ <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\">\n+ <g id=\"bolt_logo_login\" transform=\"translate(3.000000, 2.000000)\">\n+ <g id=\"Group\" transform=\"translate(321.000000, 44.000000)\" fill-rule=\"nonzero\">\n+ <g id=\"Shape\">\n+ <use fill=\"black\" fill-opacity=\"1\" filter=\"url(#filter-2)\" xlink:href=\"#path-1\"></use>\n+ <use fill=\"#FFFFFF\" xlink:href=\"#path-1\"></use>\n+ </g>\n+ <g id=\"Shape\">\n+ <use fill=\"black\" fill-opacity=\"1\" filter=\"url(#filter-4)\" xlink:href=\"#path-3\"></use>\n+ <use fill=\"#E3E3E3\" xlink:href=\"#path-3\"></use>\n+ </g>\n+ </g>\n+ <g id=\"Group\" stroke=\"#242F3C\">\n+ <path d=\"M0.179,125.821 C0.179,56.786 56.143,0.821 125.179,0.821 C194.214,0.821 250.179,56.786 250.179,125.821 C250.179,194.857 194.214,250.821 125.179,250.821 C56.143,250.821 0.179,194.857 0.179,125.821 Z\" id=\"Path\" stroke-width=\"5\" fill=\"#3C5A7E\" fill-rule=\"nonzero\"></path>\n+ <polygon id=\"Path\" stroke-width=\"6\" fill=\"#242F3C\" fill-rule=\"nonzero\" stroke-linejoin=\"bevel\" points=\"65.246 185.754 100.073 219.516 147.116 207.691 193.768 194.411 207.048 147.758 218.874 100.716 185.111 65.889 150.284 32.126 103.242 43.952 56.589 57.232 43.309 103.884 31.484 150.927 65.246 185.754\"></polygon>\n+ <polygon id=\"Path\" stroke-width=\"2\" fill=\"#FFFFFF\" fill-rule=\"nonzero\" points=\"60.02 172.903 87.54 209.77 133.374 205.79 179.061 200.391 198.531 158.709 216.699 116.442 190.337 78.739 162.817 41.873 116.984 45.852 71.296 51.252 51.826 92.934 33.658 135.2 60.021 172.903\"></polygon>\n+ <path d=\"M87.179,127.821 C87.179,105.73 105.087,87.821 127.179,87.821 C149.27,87.821 167.179,105.73 167.179,127.821 C167.179,149.913 149.27,167.821 127.179,167.821 C105.087,167.821 87.179,149.913 87.179,127.821 Z\" id=\"Path\" stroke-width=\"8\"></path>\n+ <path d=\"M85.179,125.821 C85.179,103.73 103.087,85.821 125.179,85.821 C147.27,85.821 165.179,103.73 165.179,125.821 C165.179,147.913 147.27,165.821 125.179,165.821 C103.087,165.821 85.179,147.913 85.179,125.821 Z\" id=\"Path\" stroke-width=\"2\" fill=\"#3C5A7E\" fill-rule=\"nonzero\"></path>\n+ </g>\n+ </g>\n+ </g>\n+</svg>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/static/images/bolt_logo_loginpage.svg",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<svg width=\"1114px\" height=\"256px\" viewBox=\"0 0 1114 256\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n+ <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->\n+ <title>bolt_logo_login</title>\n+ <desc>Created with Sketch.</desc>\n+ <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\">\n+ <g id=\"bolt_logo_login\" transform=\"translate(3.000000, 2.000000)\">\n+ <g id=\"Group\" transform=\"translate(321.000000, 44.000000)\" fill-rule=\"nonzero\">\n+ <path d=\"M0.992,158.667 L55.442,158.667 C87.167,158.667 112.367,145.392 112.367,115.467 C112.367,95.892 100.892,84.867 86.042,81.042 L86.042,80.142 C97.967,75.642 105.167,61.467 105.167,48.417 C105.167,20.292 81.542,11.967 51.167,11.967 L0.992,11.967 L0.992,158.667 Z M34.067,70.692 L34.067,37.617 L49.817,37.617 C65.342,37.617 72.767,41.892 72.767,53.367 C72.767,63.942 65.792,70.692 49.592,70.692 L34.067,70.692 Z M34.067,133.017 L34.067,95.217 L52.742,95.217 C70.967,95.217 79.967,100.392 79.967,113.217 C79.967,126.717 70.742,133.017 52.742,133.017 L34.067,133.017 Z M182.342,161.367 C210.467,161.367 236.567,139.992 236.567,102.867 C236.567,65.742 210.467,44.367 182.342,44.367 C153.992,44.367 127.892,65.742 127.892,102.867 C127.892,139.992 153.992,161.367 182.342,161.367 Z M182.342,134.592 C168.617,134.592 161.867,122.217 161.867,102.867 C161.867,83.517 168.617,71.142 182.342,71.142 C195.842,71.142 202.817,83.517 202.817,102.867 C202.817,122.217 195.842,134.592 182.342,134.592 Z M289.667,161.367 C297.092,161.367 302.717,160.242 306.317,158.667 L302.267,134.142 C300.467,134.592 299.567,134.592 298.217,134.592 C295.517,134.592 292.367,132.342 292.367,125.367 L292.367,0.942 L259.292,0.942 L259.292,124.017 C259.292,146.517 266.942,161.367 289.667,161.367 Z M366.617,161.367 C377.417,161.367 385.517,159.117 391.367,157.317 L386.192,133.242 C383.267,134.367 379.217,135.492 375.617,135.492 C366.842,135.492 361.217,130.317 361.217,117.717 L361.217,72.942 L387.992,72.942 L387.992,47.067 L361.217,47.067 L361.217,17.367 L333.767,17.367 L329.942,47.067 L312.842,48.417 L312.842,72.942 L328.142,72.942 L328.142,118.167 C328.142,144.042 338.942,161.367 366.617,161.367 L366.617,161.367 Z\" id=\"Shape\" fill=\"#242F3C\"></path>\n+ <path d=\"M467.167,161.367 C483.817,161.367 495.067,154.617 503.392,148.542 L493.042,133.242 C487.417,137.742 480.667,141.792 472.117,141.792 C457.267,141.792 449.842,132.117 449.842,115.467 C449.842,88.017 467.167,65.067 486.967,65.067 C494.392,65.067 498.892,67.767 504.067,73.617 L517.567,58.992 C511.492,51.792 502.042,45.492 488.542,45.492 C454.117,45.492 425.092,76.767 425.092,116.367 C425.092,144.942 442.867,161.367 467.167,161.367 L467.167,161.367 Z M521.392,158.667 L545.692,158.667 L560.542,83.292 C571.567,71.367 581.017,66.192 586.867,66.192 C595.642,66.192 600.142,70.917 600.142,80.367 C600.142,83.742 599.467,86.892 598.342,92.067 L585.067,158.667 L609.142,158.667 L624.217,83.292 C635.467,71.367 644.917,66.192 650.542,66.192 C659.542,66.192 664.042,70.917 664.042,80.367 C664.042,83.742 663.367,86.892 662.242,92.067 L648.742,158.667 L673.042,158.667 L686.992,88.917 C688.117,83.067 688.792,78.567 688.792,73.392 C688.792,55.617 680.917,45.492 662.692,45.492 C650.767,45.492 637.492,53.592 624.442,65.967 C622.192,54.042 615.892,45.492 598.792,45.492 C586.867,45.492 574.042,53.817 562.792,63.717 L561.892,63.717 L563.017,48.192 L543.442,48.192 L521.392,158.667 Z M736.717,161.367 C762.142,161.367 780.592,147.417 780.592,126.042 C780.592,112.542 772.492,103.767 756.067,94.992 C746.617,89.592 737.167,85.767 737.167,77.667 C737.167,70.017 744.592,63.717 754.717,63.717 C763.492,63.717 770.242,68.442 775.867,74.067 L789.367,61.242 C780.817,52.242 769.117,45.492 754.717,45.492 C732.667,45.492 714.442,59.892 714.442,79.917 C714.442,93.192 723.442,102.417 738.067,110.517 C752.017,118.167 757.867,121.992 757.867,128.967 C757.867,137.067 748.867,143.367 738.517,143.367 C728.617,143.367 719.617,137.967 712.417,128.517 L698.017,140.217 C706.342,152.817 722.767,161.367 736.717,161.367 L736.717,161.367 Z\" id=\"Shape\" fill=\"#3C5A7E\"></path>\n+ </g>\n+ <g id=\"Group\" stroke=\"#242F3C\">\n+ <path d=\"M0.179,125.821 C0.179,56.786 56.143,0.821 125.179,0.821 C194.214,0.821 250.179,56.786 250.179,125.821 C250.179,194.857 194.214,250.821 125.179,250.821 C56.143,250.821 0.179,194.857 0.179,125.821 Z\" id=\"Path\" stroke-width=\"5\" fill=\"#3C5A7E\" fill-rule=\"nonzero\"></path>\n+ <polygon id=\"Path\" stroke-width=\"6\" fill=\"#242F3C\" fill-rule=\"nonzero\" stroke-linejoin=\"bevel\" points=\"65.246 185.754 100.073 219.516 147.116 207.691 193.768 194.411 207.048 147.758 218.874 100.716 185.111 65.889 150.284 32.126 103.242 43.952 56.589 57.232 43.309 103.884 31.484 150.927 65.246 185.754\"></polygon>\n+ <polygon id=\"Path\" stroke-width=\"2\" fill=\"#FFFFFF\" fill-rule=\"nonzero\" points=\"60.02 172.903 87.54 209.77 133.374 205.79 179.061 200.391 198.531 158.709 216.699 116.442 190.337 78.739 162.817 41.873 116.984 45.852 71.296 51.252 51.826 92.934 33.658 135.2 60.021 172.903\"></polygon>\n+ <path d=\"M87.179,127.821 C87.179,105.73 105.087,87.821 127.179,87.821 C149.27,87.821 167.179,105.73 167.179,127.821 C167.179,149.913 149.27,167.821 127.179,167.821 C105.087,167.821 87.179,149.913 87.179,127.821 Z\" id=\"Path\" stroke-width=\"8\"></path>\n+ <path d=\"M85.179,125.821 C85.179,103.73 103.087,85.821 125.179,85.821 C147.27,85.821 165.179,103.73 165.179,125.821 C165.179,147.913 147.27,165.821 125.179,165.821 C103.087,165.821 85.179,147.913 85.179,125.821 Z\" id=\"Path\" stroke-width=\"2\" fill=\"#3C5A7E\" fill-rule=\"nonzero\"></path>\n+ </g>\n+ </g>\n+ </g>\n+</svg>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_base/layout_blank.html.twig",
"new_path": "templates/_base/layout_blank.html.twig",
"diff": "{{ include('_partials/favicon.html.twig') }}\n</head>\n-<body>\n+<body{% if block('body_class') %} class=\"{% block body_class %}{% endblock %}\"{% endif %}>\n{% block main %}\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/security/login.html.twig",
"new_path": "templates/security/login.html.twig",
"diff": "{{ 'title.login'|trans }}\n{% endblock %}\n-{% block html_id 'login' %}\n+{% block html_id %}{% endblock %}\n-{% block html_class %}\n- {% if not config.get('general/omit_backgrounds') %}with-background{% endif %}\n-{% endblock %}\n+{% block html_class %}{% endblock %}\n+\n+{% block body_class %}page--login{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}\n{% block javascripts %}\n{{ parent() }}\n{% block main %}\n<div>\n-\n- <div>\n+ <div class=\"login__logo\">\n<img class=\"logo\" alt=\"Bolt CMS logo\"\n- src=\"{{ asset('assets/images/bolt_logo_login.svg', 'public') }}\">\n+ {% if not config.get('general/omit_backgrounds') %}\n+ src=\"{{ asset('assets/images/bolt_logo_loginpage--bg.svg', 'public') }}\">\n+ {% else %}\n+ src=\"{{ asset('assets/images/bolt_logo_loginpage.svg', 'public') }}\">\n+ {% endif %}\n<h1>{{ config.get('general/sitename') }}</h1>\n</div>\n- <div class=\"card\">\n+ <div class=\"card login__login-form\">\n<div class=\"card-header\">\n<i class=\"fa fa-lock\" aria-hidden=\"true\"></i>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
redo style on login page, use body classes iso html classes and id, add logo version when bg images enabled
|
95,192 |
18.10.2019 09:31:21
| -7,200 |
922bfef193e0837b4d9cbe8e1bd290ef6f0b5a7f
|
fix space on travis test error
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/_login.scss",
"new_path": "assets/scss/layout/_login.scss",
"diff": ".page--login {\n-\n> div {\nmax-width: 25rem;\nmargin: 0 auto;\npadding-top: 7rem;\n}\n}\n-\nh1 {\ntext-align: center;\nmargin: 2rem 0;\nfont-size: 1.25rem;\n}\n-\nbody {\nbackground: transparent;\ndisplay: flex;\njustify-content: center;\nalign-items: center;\n}\n-\n.login__login-form {\n.card-body {\npadding: 1rem;\nfont-weight: 400;\n}\n}\n-\n.login__logo {\npadding: 0 2rem;\nimg {\ndisplay: block;\n}\n}\n-\n&.with-background {\nbackground-image: url(https://source.unsplash.com/daily);\nbackground-position: center;\ntext-shadow: 0px 1px 1px var(--shade);\n}\n}\n-\n}\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
fix space on travis test error
|
95,192 |
18.10.2019 09:56:14
| -7,200 |
66beed54ad42e7cab5b58174951317afdbc1f915
|
fix with stylelint proper scss file conventions
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/_login.scss",
"new_path": "assets/scss/layout/_login.scss",
"diff": "max-width: 25rem;\nmargin: 0 auto;\npadding: 2rem 1rem;\n+\n@include media-breakpoint-up(sm) {\npadding-top: 4rem;\n}\n+\n@include media-breakpoint-up(md) {\npadding-top: 5rem;\n}\n+\n@include media-breakpoint-up(lg) {\npadding-top: 7rem;\n}\n}\n+\nh1 {\ntext-align: center;\nmargin: 2rem 0;\nfont-size: 1.25rem;\n}\n+\nbody {\nbackground: transparent;\ndisplay: flex;\njustify-content: center;\nalign-items: center;\n}\n+\n.login__login-form {\n.card-body {\npadding: 1rem;\n}\n+\n.form-check-label {\nfont-weight: 400;\n}\n}\n+\n.login__logo {\npadding: 0 2rem;\n+\nimg {\nmax-width: 100%;\ndisplay: block;\n}\n}\n+\n&.with-background {\nbackground-image: url(https://source.unsplash.com/daily);\nbackground-position: center;\nbackground-size: cover;\n+\nh1 {\ncolor: $white;\n- text-shadow: 0px 1px 1px var(--shade);\n+ text-shadow: 0 1px 1px var(--shade);\n}\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
fix with stylelint proper scss file conventions
|
95,192 |
18.10.2019 12:28:38
| -7,200 |
79c3015038afd5e87b6e563eb585954f5f2bd420
|
Split up fields in record stats sidebar to editable and summary, rearrange, add logic to value only for fields
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/scss/modules/editor/_forms.scss",
"diff": "+.form-fieldsgroup {\n+ margin-bottom: 1.5rem;\n+}\n+\n+.form-fieldsgroup__summary-fields {\n+ margin-bottom: 1rem;\n+ color: var(--shade);\n+ font-size: 0.9375rem;\n+ label {\n+ margin-bottom: 0;\n+ margin-right: 0.25rem;\n+ }\n+ .form-group {\n+ display: flex;\n+ flex-wrap: wrap;\n+ margin-bottom: 0.25rem;\n+ }\n+}\n+\n+.summary-fields {\n+ padding-left: 1rem;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/editor.scss",
"new_path": "assets/scss/modules/editor/editor.scss",
"diff": "@import 'fields/fields';\n@import '_tabbar';\n+@import '_forms';\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/date.html.twig",
"new_path": "templates/_partials/fields/date.html.twig",
"diff": "{% if mode is not defined %}\n{% set mode = define.mode|default(false) %}\n{% endif %}\n+ {# check if we only want the value: valueonly #}\n+ {% if valueonly is not defined %}\n+ {% set valueonly = false %}\n+ {% endif %}\n+ {% if not valueonly %}\n<editor-date\n:value='{{ value|json_encode }}'\nname='{{ name }}'\nlocale='{{user.locale}}'\nlabels='{{ { 'toggle': 'editor_date.toggle'|trans }|json_encode }}'\n></editor-date>\n+ {% else %}\n+ <span\n+ :id='{{ id|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ class=\"\"\n+ >{{ value|date(format='F d, Y - g:ia')}}</span>\n+ {% endif %}\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/text.html.twig",
"new_path": "templates/_partials/fields/text.html.twig",
"diff": "{% set disabled = false %}\n{% endif %}\n+{# check if we only want the value: valueonly #}\n+{% if valueonly is not defined %}\n+ {% set valueonly = false %}\n+{% endif %}\n+\n{% block field %}\n+ {% if not valueonly %}\n<editor-text\n:id='{{ id|json_encode }}'\n:value=\"{{ value|json_encode }}\"\n:type='{{ class|json_encode }}'\n:disabled='{{ disabled|json_encode }}'\n></editor-text>\n+ {% else %}\n+ <span\n+ :id='{{ id|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ class=\"\"\n+ >{{ value|json_encode }}</span>\n+ {% endif %}\n{% endblock %}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/fields/value.html.twig",
"diff": "+{% extends '@bolt/_partials/fields/_base.html.twig' %}\n+\n+{# check disabled #}\n+{% if disabled is not defined %}\n+ {% set disabled = false %}\n+{% endif %}\n+\n+{% block field %}\n+ <editor-text\n+ :id='{{ id|json_encode }}'\n+ :value=\"{{ value|json_encode }}\"\n+ :name='{{ name|json_encode }}'\n+ :type='{{ class|json_encode }}'\n+ :disabled='{{ disabled|json_encode }}'\n+ ></editor-text>\n+ <span>{{ value|json_encode }}</span>\n+{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_buttons.html.twig",
"new_path": "templates/content/_buttons.html.twig",
"diff": "{% import '@bolt/_macro/_macro.html.twig' as macro %}\n+<div class=\"record-actions\">\n+\n{{ macro.button('action.save', 'fa-save', 'success', {'type': 'submit', 'form': 'editcontent'}) }}\n-<div class=\"btn-group\">\n{% if record.id %}\n+ <div class=\"btn-group\">\n{{ macro.button(\n'action.preview',\n{{ 'action.view_saved'|trans }}\n</button>\n{% endif %}\n+\n</div>\n{% endif %}\n+\n+</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_fields_aside.html.twig",
"new_path": "templates/content/_fields_aside.html.twig",
"diff": "+<div class=\"form-fieldsgroup form-fieldsgroup__editable-fields\">\n+\n{% include '@bolt/_partials/fields/select.html.twig' with {\n'label' : 'field.status'|trans,\n'name' : 'status',\n'allowempty' : false\n} %}\n-{% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.createdAt'|trans,\n- 'name' : 'createdAt',\n- 'value' : record.createdAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n-} %}\n-\n-{% include '@bolt/_partials/fields/date.html.twig' with {\n- 'label' : 'field.modifiedAt'|trans,\n- 'name' : 'modifiedAt',\n- 'value' : record.modifiedAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent'\n-} %}\n-\n{% include '@bolt/_partials/fields/date.html.twig' with {\n'label' : 'field.publishedAt'|trans,\n'name' : 'publishedAt',\n'disabled' : true\n} %}\n-{% include '@bolt/_partials/fields/text.html.twig' with {\n- 'label' : 'field.id'|trans,\n- 'name' : 'id',\n- 'value' : record.id,\n- 'disabled' : true\n-} %}\n+</div>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/content/_fields_aside_summary.html.twig",
"diff": "+<div class=\"form-fieldsgroup form-fieldsgroup__summary-fields\">\n+ <ul class=\"summary-fields\">\n+ <li>\n+ {% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.createdAt'|trans,\n+ 'name' : 'createdAt',\n+ 'value' : record.createdAt,\n+ 'disabled' : true,\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent',\n+ 'valueonly' : true\n+ } %}\n+ </li>\n+\n+ <li>\n+ {% include '@bolt/_partials/fields/date.html.twig' with {\n+ 'label' : 'field.modifiedAt'|trans,\n+ 'name' : 'modifiedAt',\n+ 'value' : record.modifiedAt,\n+ 'disabled' : true,\n+ 'mode' : 'datetime',\n+ 'form' : 'editcontent',\n+ 'valueonly' : true\n+ } %}\n+ </li>\n+\n+ <li>\n+ {% include '@bolt/_partials/fields/text.html.twig' with {\n+ 'label' : 'field.id'|trans,\n+ 'name' : 'id',\n+ 'value' : record.id,\n+ 'disabled' : true,\n+ 'valueonly' : true\n+ } %}\n+ </li>\n+ </ul>\n+</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "<div id=\"metadata\">\n<form class=\"ui form\">\n+ {% include '@bolt/content/_localeswitcher.html.twig' %}\n+\n<div class=\"card mb-3\">\n<div class=\"card-body\">\n{% include '@bolt/content/_buttons.html.twig' %}\n</div>\n</div>\n- {% include '@bolt/content/_localeswitcher.html.twig' %}\n-\n<div class=\"card\">\n<div class=\"card-body\">\n{% include '@bolt/content/_fields_aside.html.twig' %}\n+ {% include '@bolt/content/_fields_aside_summary.html.twig' %}\n</div>\n</div>\n+\n</form>\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Split up fields in record stats sidebar to editable and summary, rearrange, add logic to value only for fields
|
95,144 |
19.10.2019 10:17:49
| -7,200 |
d47b61d921664f870be2485cf007aac230bc37e6
|
Tidy up the overview screen
|
[
{
"change_type": "MODIFY",
"old_path": "templates/content/listing.html.twig",
"new_path": "templates/content/listing.html.twig",
"diff": "{# This 'topsection' gets output _before_ the main form, allowing `dump()`, without breaking Vue #}\n{% block topsection %}\n- {{ dump(whereValues) }}\n+\n{% endblock %}\n{% block main %}\n- {% setcontent records = (contentType.slug) orderby (sortBy) where (whereValues) limit (contentType.records_per_page) printquery %}\n+ {% setcontent records = (contentType.slug) orderby (sortBy) where (whereValues) limit (contentType.records_per_page) %}\n<div>\n{% include '@bolt/_partials/_content_listing.html.twig' with {'records': records, 'type': contentType.slug } %}\n<p>\n<strong>{{ 'listing.title_sortby'|trans }}</strong>:\n<select class=\"form-control\" name=\"sortBy\">\n- <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n- {{ 'listing.option_select_item'|trans }}\n+ <option value=\"\" {% if sortBy is empty %}selected{% endif %}>\n+ {{ 'listing.option_select_sortby'|trans }}\n</option>\n{% for key, filterOption in filterOptions %}\n<option value=\"{{ key }}\" {% if sortBy == key %}selected{% endif %}>\n{{ filterOption }}\n</option>\n+ <option value=\"-{{ key }}\" {% if sortBy == key %}selected{% endif %}>\n+ -{{ filterOption }}\n+ </option>\n{% endfor %}\n</select>\n</p>\n+ {#\n{% if contentType.get('taxonomy') %}\n<p>\n<strong>{{ 'listing.title_taxonomy'|trans }}</strong>:\n<select class=\"form-control\" name=\"taxonomy\">\n- <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n+ <option value=\"\" {% if sortBy is empty %}selected{% endif %}>\n{{ 'listing.option_select_item'|trans }}\n</option>\n{% for taxonomy in contentType.get('taxonomy') %}\n</select>\n</p>\n{% endif %}\n+ #}\n<p>\n<strong>{{ 'listing.title_title'|trans }}</strong>:\n<input class=\"form-control\" type=\"text\" name=\"filter\" value=\"{{ filterValue }}\"\n</p>\n</div>\n<div class=\"form-group\">\n- <button class=\"btn btn-tertiary\" type=\"submit\">{{ 'listing.button_filter'|trans }}</button>\n+ {{ macro.button('listing.button_filter', 'filter', 'tertiary', {'type': 'submit'}) }}\n+\n{% if sortBy is not empty or filterValue is not empty %}\n- <a class=\"btn btn-danger\"\n- href=\"{{ path('bolt_content_overview', {'contentType': contentType.slug}) }}\">\n- <i class=\"fa fa-close\"></i>\n- {{ 'listing.button_clear'|trans }}\n- </a>\n+ {{ macro.buttonlink('listing.button_clear', path('bolt_content_overview', {'contentType': contentType.slug}), 'times', 'tertiary') }}\n{% endif %}\n</div>\n</form>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tidy up the overview screen
|
95,144 |
19.10.2019 12:34:14
| -7,200 |
fde0acfc59c54a0b06b1d2d2c23869fa90b8df98
|
Delete foobar.php
|
[
{
"change_type": "DELETE",
"old_path": "foobar.php",
"new_path": null,
"diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Controller\\Backend;\n-\n-use Bolt\\Common\\Json;\n-use Bolt\\Common\\Str;\n-use Bolt\\Controller\\CsrfTrait;\n-use Bolt\\Controller\\TwigAwareController;\n-use Bolt\\Entity\\User;\n-use Doctrine\\Common\\Persistence\\ObjectManager;\n-use Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\n-use Symfony\\Component\\HttpFoundation\\RedirectResponse;\n-use Symfony\\Component\\HttpFoundation\\Request;\n-use Symfony\\Component\\HttpFoundation\\Response;\n-use Symfony\\Component\\Routing\\Annotation\\Route;\n-use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n-use Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\n-use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\n-\n-/**\n- * @Security(\"is_granted('ROLE_ADMIN')\")\n- */\n-class ProfileController extends TwigAwareController implements BackendZone\n-{\n- use CsrfTrait;\n-\n- /** @var UrlGeneratorInterface */\n- private $urlGenerator;\n-\n- /** @var ObjectManager */\n- private $em;\n-\n- /** @var UserPasswordEncoderInterface */\n- private $passwordEncoder;\n-\n-\n-\n-\n-\n- private function validateUser(User $user, ?string $newPassword): bool\n- {\n- // @todo Validation should be moved to a separate UserValidator\n-\n- $usernameValidateOptions = [\n- 'options' => [\n- 'min_range' => 1,\n- ],\n- ];\n-\n- // Validate username\n- if (! filter_var(mb_strlen($user->getDisplayName()), FILTER_VALIDATE_INT, $usernameValidateOptions)) {\n- $this->addFlash('danger', 'user.not_valid_username');\n- return false;\n- }\n-\n- // Validate email\n- if (! filter_var($user->getEmail(), FILTER_VALIDATE_EMAIL)) {\n- $this->addFlash('danger', 'user.not_valid_email');\n- return false;\n- }\n-\n- // Validate password\n- if (! empty($newPassword) && mb_strlen($newPassword) < 6) {\n- $this->addFlash('danger', 'user.not_valid_password');\n- return false;\n- }\n-\n- return true;\n- }\n-}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Delete foobar.php
|
95,144 |
20.10.2019 14:13:02
| -7,200 |
4d74b9ffb578f9af6af0a58f2af85bba33b4ca8b
|
Tiny fixes for the listing and edit screens
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -94,6 +94,7 @@ pages:\nfilter: '*.twig'\ntaxonomy: [ groups ]\nlisting_records: 6\n+ locales: ['en', 'nl', 'ja', 'nb']\n# Entries can be used for things like 'news' or 'blogpostings'. They have a\n# 'teaser', which can be used for a short blurb on listing-pages, allowing\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_localeswitcher.html.twig",
"new_path": "templates/content/_localeswitcher.html.twig",
"diff": "+{% import '@bolt/_macro/_macro.html.twig' as macro %}\n+\n{% if record.id and currentlocale %}\n<div class=\"card mb-3\">\n+ <div class=\"card-header\">\n+ {{ 'field.current_locale'|trans }}:\n+ {{ flag(currentlocale) }}<b>{{ currentlocale }}</b>\n+ </div>\n<div class=\"card-body\">\n- <p>{{ 'field.current_locale'|trans }}:\n- {{ flag(currentlocale) }}<b>{{ currentlocale }}</b>.</p>\n+\n<general-language\nlabel=\"{{ 'field.switch_to_locale'|trans }}\"\ncurrent=\"{{ currentlocale }}\"\n:locales=\"{{ locales() }}\"\n></general-language>\n- <a class=\"btn btn-light btn-small\" href=\"{{ path('bolt_content_edit_locales', {'id': record.id}) }}\">\n- {{ 'localeswitcher.button_info'|trans }}\n- </a>\n+ {{ macro.buttonlink('localeswitcher.button_info', path('bolt_content_edit_locales', {'id': record.id}), 'language', 'tertiary') }}\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/edit.html.twig",
"new_path": "templates/content/edit.html.twig",
"diff": "<div id=\"metadata\">\n<form class=\"ui form\">\n- {% include '@bolt/content/_localeswitcher.html.twig' %}\n-\n<div class=\"card mb-3\">\n+ <div class=\"card-header\">\n+ {{ 'title.save_changes'|trans }}\n+ </div>\n<div class=\"card-body\">\n{% include '@bolt/content/_buttons.html.twig' %}\n</div>\n</div>\n+ {% include '@bolt/content/_localeswitcher.html.twig' %}\n+\n<div class=\"card\">\n+ <div class=\"card-header\">\n+ {{ 'title.options'|trans }}\n+ </div>\n<div class=\"card-body\">\n{% include '@bolt/content/_fields_aside.html.twig' %}\n{% include '@bolt/content/_fields_aside_summary.html.twig' %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/listing.html.twig",
"new_path": "templates/content/listing.html.twig",
"diff": "'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'\n} %}\n- <div class=\"card\">\n+ <div class=\"card mb-3\">\n<div class=\"card-header\">\n{{ 'title.contentlisting'|trans }}\n</div>\n<li>Slug: <code>{{ contentType.slug }}</code> (singular: <code>{{ contentType.singular_slug }}</code>)</li>\n<li>Record template: <code>{{ contentType.record_template }}</code></li>\n<li>Listing template: <code>{{ contentType.listing_template }}</code> ({{ contentType.listing_records }} records)</li>\n- {% if contentType.locales %}\n+ {% if contentType.locales is not empty %}\n<li>Locales:\n{% for locale in contentType.locales %}\n{{ flag(locale) }}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.nl.xlf",
"new_path": "translations/messages.nl.xlf",
"diff": "<target>ContentType</target>\n</segment>\n</unit>\n+ <unit id=\"Dgtkgju\" name=\"title.edit_user_profile\">\n+ <segment>\n+ <source>title.edit_user_profile</source>\n+ <target>Bewerk gebruikersprofiel</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"YDH.7uR\" name=\"user.updated_profile\">\n+ <segment>\n+ <source>user.updated_profile</source>\n+ <target>Gebruikersprofiel is bijgewerkt!</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"n.jOrkg\" name=\"caption.untitled_contenttype\">\n+ <segment>\n+ <source>caption.untitled_contenttype</source>\n+ <target>%contenttype% zonder titel</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"SDVQEir\" name=\"title.save_changes\">\n+ <segment>\n+ <source>title.save_changes</source>\n+ <target>Opslaan</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"7616Os4\" name=\"title.options\">\n+ <segment>\n+ <source>title.options</source>\n+ <target>Opties</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tiny fixes for the listing and edit screens
|
95,144 |
21.10.2019 21:05:33
| -7,200 |
51c8912a58ad341b20f6b5ed51cf65797b549424
|
Make sure Select fields are saved properly
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/SelectField.php",
"new_path": "src/Entity/Field/SelectField.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity\\Field;\n+use Bolt\\Common\\Json;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Entity\\FieldInterface;\nuse Doctrine\\ORM\\Mapping as ORM;\n@@ -19,6 +20,17 @@ class SelectField extends Field implements FieldInterface\nreturn 'select';\n}\n+ public function setValue($value): Field\n+ {\n+ try {\n+ $this->value = (array) Json::json_decode($value);\n+ } catch (\\TypeError $exception) {\n+ $this->value = (array) $value;\n+ }\n+\n+ return $this;\n+ }\n+\npublic function getValue(): ?array\n{\nif (empty($this->value)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/select.html.twig",
"new_path": "templates/_partials/fields/select.html.twig",
"diff": "{% endif %}\n{% block field %}\n+ {% dump(options) %}\n<editor-select\n:value=\"{{ value|json_encode }}\"\n:name='{{ name|json_encode }}'\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make sure Select fields are saved properly
|
95,144 |
31.10.2019 13:38:42
| -3,600 |
cf7e270934c71b0c5b9605ffa3c83178bf01d35c
|
Introduce `field|label` and `field|type` shorthands
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"new_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"diff": "{# Special case for 'select' fields: if it's a multiple select, the field is an array. #}\n{% if type == \"select\" and field is not empty %}\n- <p><strong>{{ field.definition.label|default(field.name) }}: </strong>\n+\n+ <p><strong>{{ field|label }}: </strong>\n{{ dump(field) }}\n</p>\n{% endif %}\n{# Checkbox fields #}\n{% if type == \"checkbox\" %}\n- <p><strong>{{ field.definition.label|default(field.name) }}</strong>: {{ field ? \"checked\" : \"not checked\" }}</p>\n+ <p><strong>{{ field|label }}</strong>: {{ field ? \"checked\" : \"not checked\" }}</p>\n{% endif %}\n{# Imagelist fields #}\n{# No special case defined for this type of field. We just output them, if it's\na simple scalar, and 'dump' them otherwise. #}\n{% if type in [ 'filelist', 'datetime', 'date', 'integer', 'float' ] and field is not empty %}\n- <p><strong>{{ field.definition.label|default(field.name) }}: </strong>\n+ <p><strong>{{ field|label }}: </strong>\n{% if field is iterable %}\n{{ dump(field) }}\n{% else %}\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/partials/_sub_fields.twig",
"new_path": "public/theme/skeleton/partials/_sub_fields.twig",
"diff": "{# SECTION 2: LOOPING AND ITERATION - The actual looping is done here. #}\n{% for field in record.fields|filter(field => field.name not in omittedkeys) %}\n- {% set type = field.definition.type %}\n+ {% set type = field|type %}\n{# Fields that are considered 'common': 'html', 'markdown', 'textarea',\n'text', 'image', 'video' and 'imagelist' #}\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/record.twig",
"new_path": "public/theme/skeleton/record.twig",
"diff": "{# Output all fields, in the order as defined in the content type.\nTo change the generated html and configure the options, see:\nhttps://docs.bolt.cm/templating #}\n- {% with { 'record': record, 'exclude': [record|image.fieldname|default()] } %}\n+ {% with { 'record': record, 'exclude': [record|image.fieldname|default()], 'extended': true } %}\n{{ block('sub_fields', 'partials/_sub_fields.twig') }}\n{% endwith %}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -187,7 +187,8 @@ class ContentTypesParser extends BaseParser\n$acceptFileTypes = $this->generalConfig->get('accept_file_types');\nforeach ($fields as $key => $field) {\n- unset($fields[$key]);\n+ $field['slug'] = $key;\n+\n$key = str_replace('-', '_', mb_strtolower(Str::makeSafe($key, true)));\nif (! isset($field['type']) || empty($field['type'])) {\n$error = sprintf('Field \"%s\" has no \"type\" set.', $key);\n@@ -224,6 +225,10 @@ class ContentTypesParser extends BaseParser\n$hasGroups = true;\n}\n+ if (empty($field['label'])) {\n+ $field['label'] = ucwords($key);\n+ }\n+\nif (isset($field['allow_html']) === false) {\n$field['allow_html'] = in_array($field['type'], ['html', 'markdown'], true);\n}\n@@ -242,7 +247,6 @@ class ContentTypesParser extends BaseParser\n'class' => '',\n'default' => '',\n'group' => $currentGroup,\n- 'label' => '',\n'variant' => '',\n'localize' => false,\n],\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/FieldExtension.php",
"new_path": "src/Twig/FieldExtension.php",
"diff": "@@ -7,10 +7,22 @@ namespace Bolt\\Twig;\nuse Bolt\\Entity\\Field;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Extension\\AbstractExtension;\n+use Twig\\TwigFilter;\nuse Twig\\TwigFunction;\nclass FieldExtension extends AbstractExtension\n{\n+ /**\n+ * {@inheritdoc}\n+ */\n+ public function getFilters(): array\n+ {\n+ return [\n+ new TwigFilter('label', [$this, 'getLabel']),\n+ new TwigFilter('type', [$this, 'getType']),\n+ ];\n+ }\n+\npublic function getFunctions(): array\n{\nreturn [\n@@ -26,4 +38,14 @@ class FieldExtension extends AbstractExtension\nreturn Field::factory($definition, $name);\n}\n+\n+ public function getLabel(Field $field): string\n+ {\n+ return $field->getDefinition()->get('label');\n+ }\n+\n+ public function getType(Field $field): string\n+ {\n+ return $field->getDefinition()->get('type');\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_base.html.twig",
"new_path": "templates/_partials/fields/_base.html.twig",
"diff": "{# Set the value #}\n{% if not value|default %}\n{% set value = field.value|default('') %}\n- {% if value is iterable and field.definition.type != \"select\" %}\n+ {% if value is iterable and field|type != \"select\" %}\n{% set value = value|first %}\n{% endif %}\n{% endif %}\n{% if not label|default %}\n{% set label = field.definition.label|default(field.name|default('unnamed')|ucwords) %}\n{% endif %}\n-{% if type != 'checkbox' %}\n- {% set label = label|trim(':') ~ ':' %}\n-{% endif %}\n{# Set the placeholder #}\n{% if not placeholder|default %}\n{%- endapply -%}\n-\n-<!-- field \" {{ type }} {{ variant }} {{ label }} {{ name }} -->\n+<!-- field \"{{ label }}\" (type: {{ type }}{% if variant != 'normal' %}, variant: {{ variant }}{% endif %}) -->\n<div class=\"form-group editor--group is-{{ variant }}\">\n{{ prefix|raw }}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_label.html.twig",
"new_path": "templates/_partials/fields/_label.html.twig",
"diff": "-{% if type != 'checkbox' %}\n+{%- if type != 'checkbox' -%}\n<label for=\"{{ id }}\">\n- {% if localize %}\n+\n+ {%- if localize -%}\n<i class=\"fas fa-language\"></i>\n- {% endif %}\n- {{ label }}\n- </label>\n-{% endif %}\n+ {%- endif -%}\n+\n+ {{- label -}}\n+ {%- if type != 'checkbox' -%}\n+ {{- ':' -}}\n+ {%- endif -%}\n+\n+ </label>\n+{%- endif -%}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/view_locales.html.twig",
"new_path": "templates/content/view_locales.html.twig",
"diff": "{% for name, field in record.fields %}\n<tr>\n<td>\n- <b>{{ field.definition.label|default(field.name) }}</b><br>\n- Type: {{ field.definition.type }}<br>\n+ <b>{{ field|label }}</b><br>\n+ Type: {{ field|type }}<br>\n</td>\n{% set localizedValues = find_translations(field) %}\n{% for locale in locales %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_field_blocks.twig",
"new_path": "templates/helpers/_field_blocks.twig",
"diff": "{# Special case for 'select' fields: if it's a multiple select, the field is an array. #}\n{% if type == \"select\" and field is not empty %}\n- <p><strong>{{ field.definition.label|default(field.name) }}: </strong>\n+ <p><strong>{{ field|label }}: </strong>\n{{ dump(field) }}\n</p>\n{% endif %}\n{# Checkbox fields #}\n{% if type == \"checkbox\" %}\n- <p><strong>{{ field.definition.label|default(field.name) }}</strong>: {{ field ? \"checked\" : \"not checked\" }}</p>\n+ <p><strong>{{ field|label }}</strong>: {{ field ? \"checked\" : \"not checked\" }}</p>\n{% endif %}\n{# Imagelist fields #}\n{# No special case defined for this type of field. We just output them, if it's\na simple scalar, and 'dump' them otherwise. #}\n{% if type in [ 'filelist', 'datetime', 'date', 'integer', 'float' ] and field is not empty %}\n- <p><strong>{{ field.definition.label|default(field.name) }}: </strong>\n+ <p><strong>{{ field|label }}: </strong>\n{% if field is iterable %}\n{{ dump(field) }}\n{% else %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_fields.twig",
"new_path": "templates/helpers/_fields.twig",
"diff": "{# SECTION 2: LOOPING AND ITERATION - The actual looping is done here. #}\n{% for field in record.fields|filter(field => field.name not in omittedkeys) %}\n- {% set type = field.definition.type %}\n+ {% set type = field|type %}\n{# Fields that are considered 'common': 'html', 'markdown', 'textarea',\n'text', 'image', 'video' and 'imagelist' #}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/pages/kitchensink.html.twig",
"new_path": "templates/pages/kitchensink.html.twig",
"diff": "{% set field = record.field(key) %}\n{% include [\n- '@bolt/_partials/fields/' ~ field.definition.type ~ '.html.twig',\n+ '@bolt/_partials/fields/' ~ field|type ~ '.html.twig',\n'@bolt/_partials/fields/generic.html.twig'\n] with { 'field': field } %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Introduce `field|label` and `field|type` shorthands
|
95,144 |
01.11.2019 07:27:23
| -3,600 |
2a40a1137d23a8b4b9c337ee436fb16081aa6b4f
|
Making selects display proper in frontend
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"new_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"diff": "{% if type == \"select\" and field is not empty %}\n<p><strong>{{ field|label }}: </strong>\n- {{ dump(field) }}\n+\n+ {% if field.contentselect() %}\n+ {# this field is being used as a field to select other Content #}\n+\n+ {% set selectedRecords = field|selected(returnarray = true) %}\n+\n+ <ul>\n+ {% for record in selectedRecords %}\n+ <li><a href=\"{{ record|link }}\">{{ record|title }}</a></li>\n+ {% endfor %}\n+ </ul>\n+\n+ {% else %}\n+\n+ <ul>\n+ {% for value in field.value %}\n+ <li>{{ value }}</li>\n+ {% endfor %}\n+ </ul>\n+\n+ {% endif %}\n+\n</p>\n{% endif %}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field.php",
"new_path": "src/Entity/Field.php",
"diff": "@@ -273,4 +273,13 @@ class Field implements Translatable, FieldInterface\n{\nreturn 'generic';\n}\n+\n+ /**\n+ * Used in SelectField, to distinguish between selects for \"a list of items\"\n+ * and \"select from a list of Content\"\n+ */\n+ public function isContentSelect(): bool\n+ {\n+ return false;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/SelectField.php",
"new_path": "src/Entity/Field/SelectField.php",
"diff": "@@ -45,4 +45,15 @@ class SelectField extends Field implements FieldInterface\nreturn (array) $this->value;\n}\n+\n+ public function isContentSelect(): bool\n+ {\n+ $values = $this->getDefinition()->get('values');\n+\n+ if (is_string($values) && mb_strpos($values, '/') !== false) {\n+ return true;\n+ }\n+\n+ return false;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/FieldInterface.php",
"new_path": "src/Entity/FieldInterface.php",
"diff": "@@ -10,4 +10,6 @@ namespace Bolt\\Entity;\ninterface FieldInterface\n{\npublic function getType(): string;\n+\n+ public function isContentSelect(): bool;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/FieldExtension.php",
"new_path": "src/Twig/FieldExtension.php",
"diff": "@@ -4,7 +4,9 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\n+use Bolt\\Repository\\ContentRepository;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\n@@ -12,6 +14,18 @@ use Twig\\TwigFunction;\nclass FieldExtension extends AbstractExtension\n{\n+ /** @var Notifications */\n+ private $notifications;\n+\n+ /** @var ContentRepository */\n+ private $contentRepository;\n+\n+ public function __construct(Notifications $notifications, ContentRepository $contentRepository)\n+ {\n+ $this->notifications = $notifications;\n+ $this->contentRepository = $contentRepository;\n+ }\n+\n/**\n* {@inheritdoc}\n*/\n@@ -20,6 +34,7 @@ class FieldExtension extends AbstractExtension\nreturn [\nnew TwigFilter('label', [$this, 'getLabel']),\nnew TwigFilter('type', [$this, 'getType']),\n+ new TwigFilter('selected', [$this, 'getSelected']),\n];\n}\n@@ -48,4 +63,31 @@ class FieldExtension extends AbstractExtension\n{\nreturn $field->getDefinition()->get('type');\n}\n+\n+ /**\n+ * @return array|Content|null\n+ */\n+ public function getSelected(Field $field, $returnsingle = false, $returnarray = false)\n+ {\n+ $definition = $field->getDefinition();\n+\n+ if ($definition->get('type') !== 'select' || ! $field->isContentSelect()) {\n+ return $this->notifications->warning(\n+ 'Incorrect usage of `selected`-filter',\n+ 'The `selected`-filter can only be applied to a field of `type: select`, and it must be used as a selector for other content.'\n+ );\n+ }\n+\n+ $records = [];\n+\n+ foreach ($field->getValue() as $id) {\n+ $records[] = $this->contentRepository->findOneBy(['id' => (int) $id]);\n+ }\n+\n+ if ($returnsingle || (! $returnarray && $definition->get('multiple') === false)) {\n+ return current($records);\n+ }\n+\n+ return $records;\n+ }\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Making selects display proper in frontend
|
95,144 |
01.11.2019 07:27:45
| -3,600 |
c9e2dd4e14e55dc2182f280da7a7282b3dd29f4e
|
Adding simple notifications for frontend
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/Notifications.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Twig;\n+\n+use Bolt\\Configuration\\Config;\n+use Twig\\Environment;\n+use Twig\\Markup;\n+\n+class Notifications\n+{\n+ /** @var Environment */\n+ private $environment;\n+\n+ /** @var Config */\n+ private $config;\n+\n+ public function __construct(Environment $environment, Config $config)\n+ {\n+ $this->environment = $environment;\n+ $this->config = $config;\n+ }\n+\n+ public function success(string $subject, string $body)\n+ {\n+ $this->render('Success: ' . $subject, $body, 'success');\n+\n+ return null;\n+ }\n+\n+ public function danger(string $subject, string $body)\n+ {\n+ $this->render('Danger: ' . $subject, $body, 'danger');\n+\n+ return null;\n+ }\n+\n+ public function info(string $subject, string $body)\n+ {\n+ $this->render('Info: ' . $subject, $body, 'info');\n+\n+ return null;\n+ }\n+\n+ public function warning(string $subject, string $body)\n+ {\n+ $this->render('Warning: ' . $subject, $body, 'warning');\n+\n+ return null;\n+ }\n+\n+ private function render(string $subject, string $body, string $type): void\n+ {\n+ $twigVars = [\n+ 'subject' => $subject,\n+ 'body' => $body,\n+ 'type' => $type,\n+ 'basePath' => $this->config->getPath('site'),\n+ 'backtrace' => debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 7),\n+ ];\n+\n+ $output = $this->environment->render('@bolt/_partials/notification.html.twig', $twigVars);\n+\n+ echo new Markup($output, 'utf-8');\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/notification.html.twig",
"diff": "+<style>\n+\n+ .bolt__notification--default {\n+ background-color: #e2e3e5 !important;\n+ border-color: #d6d8db !important;\n+ }\n+\n+ .bolt__notification--default h1, .bolt__notification--default p, .bolt__notification--default code {\n+ color: #555 !important;\n+ }\n+\n+ .bolt__notification--warning {\n+ background: #fff3d4 !important;\n+ border-left-color: #A46A1F !important;\n+ }\n+\n+ .bolt__notification--warning h1 {\n+ color: #A46A1F !important;\n+ }\n+\n+ .bolt__notification--success {\n+ background-color: #d4edda !important;\n+ border-color: #171 !important;\n+ }\n+\n+ .bolt__notification--success h1 {\n+ color: #171 !important;\n+ }\n+\n+ .bolt__notification--danger {\n+ background-color: #f8d7da !important;\n+ border-color: #721c24 !important;\n+ }\n+\n+ .bolt__notification--danger h1 {\n+ color: #721c24 !important;\n+ }\n+\n+ .bolt__notification--info {\n+ background-color: #d1ecf1 !important;\n+ border-color: #0C5460 !important;\n+ }\n+\n+ .bolt__notification--info h1 {\n+ color: #0C5460 !important;\n+ }\n+\n+ .bolt__notification {\n+ border: none;\n+ border-left-width: 5px !important;\n+ border-left-style: solid !important;\n+ font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\" !important;\n+ font-size: 16px !important;\n+ padding: 1rem !important;\n+ margin: 1rem 0 !important;\n+ line-height: 2.4rem !important;\n+ font-weight: normal !important;\n+ }\n+\n+ .bolt__notification h1, .bolt__notification p, .bolt__notification code {\n+ letter-spacing: 0 !important;\n+ margin: 0.5rem 0 !important;\n+ padding: 0 !important;\n+ background-color: transparent !important;\n+ }\n+\n+ .bolt__notification h1 {\n+ font-size: 133% !important;\n+ margin: 0.5rem 0 1.5rem !important;\n+ font-weight: bold !important;\n+ }\n+\n+ .bolt__notification p {\n+ font-size: 100% !important;\n+ }\n+\n+ .bolt__notification li {\n+ font-size: 85% !important;\n+ line-height: 1.5rem !important;\n+ }\n+\n+\n+ .bolt__notification code {\n+ font-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif !important;\n+ }\n+\n+ .bolt__notification strong {\n+ font-weight: bold !important;\n+ }\n+\n+\n+</style>\n+<div class=\"bolt__notification bolt__notification--{{ type|default('secondary') }}\">\n+ <h1> {{ subject|markdown|striptags('<em><i><code>')|raw }}</h1>\n+ {{ body|markdown|raw }}\n+ <ul>\n+ {% for frame in backtrace|slice(2) %}\n+ <li>\n+ <code>{%- if frame.type is not empty -%}\n+ <abbr title=\"{{ frame.class }}\">\n+ {{- frame.class|split('\\\\')|last()|excerpt(24) -}}</abbr>{{- frame.type -}}\n+ {%- endif -%}\n+ <strong>{{- frame.function -}}()</strong></code> - line {{ frame.line }}\n+ </li>\n+ {% endfor %}\n+ </ul>\n+</div>\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Adding simple notifications for frontend
|
95,168 |
01.11.2019 17:32:59
| -3,600 |
e104a909ab975523453e5998521b2264754d1711
|
Pass container to Extensions
|
[
{
"change_type": "MODIFY",
"old_path": "src/Event/Subscriber/ExtensionSubscriber.php",
"new_path": "src/Event/Subscriber/ExtensionSubscriber.php",
"diff": "@@ -10,6 +10,7 @@ use Bolt\\Widgets;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Event\\ConsoleCommandEvent;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\nuse Symfony\\Component\\HttpKernel\\Event\\ControllerEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n@@ -27,7 +28,7 @@ class ExtensionSubscriber implements EventSubscriberInterface\n/** @var array */\nprivate $objects = [];\n- public function __construct(ExtensionRegistry $extensionRegistry, Widgets $widgets, Config $config, Environment $twig, EventDispatcherInterface $dispatcher, ObjectManager $objectManager, Stopwatch $stopwatch)\n+ public function __construct(ContainerInterface $container, ExtensionRegistry $extensionRegistry, Widgets $widgets, Config $config, Environment $twig, EventDispatcherInterface $dispatcher, ObjectManager $objectManager, Stopwatch $stopwatch)\n{\n$this->extensionRegistry = $extensionRegistry;\n@@ -38,6 +39,7 @@ class ExtensionSubscriber implements EventSubscriberInterface\n'dispatcher' => $dispatcher,\n'manager' => $objectManager,\n'stopwatch' => $stopwatch,\n+ 'container' => $container,\n];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Extension/BaseExtension.php",
"new_path": "src/Extension/BaseExtension.php",
"diff": "@@ -13,6 +13,7 @@ use Composer\\Package\\CompletePackage;\nuse Composer\\Package\\PackageInterface;\nuse ComposerPackages\\Packages;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Symfony\\Component\\Filesystem\\Filesystem;\nuse Symfony\\Component\\Stopwatch\\Stopwatch;\n@@ -48,6 +49,9 @@ abstract class BaseExtension implements ExtensionInterface\n/** @var Stopwatch */\nprivate $stopwatch;\n+ /** @var ContainerInterface */\n+ private $container;\n+\n/**\n* Returns the descriptive name of the Extension\n*/\n@@ -85,7 +89,7 @@ abstract class BaseExtension implements ExtensionInterface\n}\n$yamlParser = new Parser();\n-\n+//dump($filenames);die();\nforeach ($filenames as $filename) {\nif (is_readable($filename)) {\n$config = array_merge($config, $yamlParser->parseFile($filename));\n@@ -157,6 +161,7 @@ abstract class BaseExtension implements ExtensionInterface\n$this->eventDispatcher = $objects['dispatcher'];\n$this->objectManager = $objects['manager'];\n$this->stopwatch = $objects['stopwatch'];\n+ $this->container = $objects['container'];\n}\n/**\n@@ -234,4 +239,12 @@ abstract class BaseExtension implements ExtensionInterface\n{\nreturn $this->stopwatch;\n}\n+\n+ /**\n+ * @return ContainerInterface\n+ */\n+ public function getContainer(): ContainerInterface\n+ {\n+ return $this->container;\n+ }\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Pass container to Extensions
|
95,144 |
02.11.2019 07:09:39
| -3,600 |
327d1628105f514d1ccdc0748b82ea15788a5a0a
|
Allow extensions to access services
|
[
{
"change_type": "MODIFY",
"old_path": "src/Extension/BaseExtension.php",
"new_path": "src/Extension/BaseExtension.php",
"diff": "@@ -16,6 +16,7 @@ use Doctrine\\Common\\Persistence\\ObjectManager;\nuse Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Symfony\\Component\\Filesystem\\Filesystem;\n+use Symfony\\Component\\HttpFoundation\\Session\\Session;\nuse Symfony\\Component\\Stopwatch\\Stopwatch;\nuse Symfony\\Component\\Yaml\\Parser;\nuse Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface;\n@@ -210,24 +211,66 @@ abstract class BaseExtension implements ExtensionInterface\nreturn $package->current();\n}\n+ /**\n+ * This bit of code allows us to get services from the container, even if\n+ * they are not marked public. We need to be able to do this, because we\n+ * can't anticipate which services an extension's author will want to get,\n+ * and neither should we want to make them all public. So, we resort to\n+ * this, regardless of them being private / public. With great power comes\n+ * great responsibility.\n+ *\n+ * Note: We wouldn't have to do this, if we could Autowire services in our\n+ * own code. If you have good ideas on how to accomplish that, we'd be\n+ * happy to hear from your ideas.\n+ *\n+ * @return object|null\n+ * @throws \\ReflectionException\n+ */\n+ public function getService(string $name)\n+ {\n+ $container = $this->getContainer();\n+\n+ if ($container->has($name)) {\n+ return $container->get($name);\n+ }\n+\n+ $reflectedContainer = new \\ReflectionClass($container);\n+ $reflectionProperty = $reflectedContainer->getProperty('privates');\n+ $reflectionProperty->setAccessible(true);\n+\n+ $privateServices = $reflectionProperty->getValue($container);\n+\n+ if (array_key_exists($name, $privateServices)) {\n+ return $privateServices[$name];\n+ }\n+\n+ return null;\n+ }\n+\n+\npublic function getWidgets(): Widgets\n{\n- return $this->widgets;\n+ return $this->getService('Bolt\\Widgets');\n}\npublic function getBoltConfig(): Config\n{\n- return $this->boltConfig;\n+ return $this->getService('Bolt\\Configuration\\Config');\n}\npublic function getTwig(): Environment\n{\n- return $this->twig;\n+ return $this->getService('twig');\n+ }\n+\n+ public function getSession(): Session\n+ {\n+ return $this->getService('session');\n}\npublic function getEventDispatcher(): EventDispatcherInterface\n{\n- return $this->eventDispatcher;\n+ return $this->getService('event_dispatcher');\n}\npublic function getObjectManager(): ObjectManager\n@@ -237,7 +280,7 @@ abstract class BaseExtension implements ExtensionInterface\npublic function getStopwatch(): Stopwatch\n{\n- return $this->stopwatch;\n+ return $this->getService('debug.stopwatch');\n}\npublic function getContainer(): ContainerInterface\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Widget/BaseWidget.php",
"new_path": "src/Widget/BaseWidget.php",
"diff": "@@ -97,6 +97,11 @@ abstract class BaseWidget implements WidgetInterface\n$this->extension = $extension;\n}\n+ public function getExtension()\n+ {\n+ return $this->extension;\n+ }\n+\n/**\n* Method to 'invoke' the widget. Simple wrapper around the 'run' method,\n* which can be overridden in a custom Widget or trait\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Allow extensions to access services
|
95,144 |
02.11.2019 07:11:14
| -3,600 |
ccf4b1e767502ce28520a8cf5e124f3c3a691321
|
Add `console extensions:services` command
|
[
{
"change_type": "MODIFY",
"old_path": "src/Command/ExtensionsListCommand.php",
"new_path": "src/Command/ExtensionsListCommand.php",
"diff": "@@ -27,7 +27,7 @@ class ExtensionsListCommand extends Command\nprotected function configure(): void\n{\n$this\n- ->setDescription('List extensions');\n+ ->setDescription('List installed Extensions');\n}\nprotected function execute(InputInterface $input, OutputInterface $output): ?int\n@@ -43,6 +43,7 @@ class ExtensionsListCommand extends Command\n$io = new SymfonyStyle($input, $output);\nif (! empty($rows)) {\n+ $io->text('Currently installed extensions:');\n$io->table(['Class', 'Extension name'], $rows);\n} else {\n$io->caution('No installed extensions could be found');\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Command/ExtensionsServicesCommand.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Command;\n+\n+use Bolt\\Extension\\ExtensionRegistry;\n+use Symfony\\Component\\Console\\Command\\Command;\n+use Symfony\\Component\\Console\\Input\\InputInterface;\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\n+\n+class ExtensionsServicesCommand extends Command\n+{\n+ protected static $defaultName = 'extensions:services';\n+\n+ /** @var ExtensionRegistry */\n+ private $extensionRegistry;\n+\n+ /** @var ContainerInterface */\n+ private $container;\n+\n+ public function __construct(ExtensionRegistry $extensionRegistry, ContainerInterface $container)\n+ {\n+ $this->extensionRegistry = $extensionRegistry;\n+\n+ parent::__construct();\n+ $this->container = $container;\n+ }\n+\n+ protected function configure(): void\n+ {\n+ $this\n+ ->setDescription('List services available in Extensions');\n+ }\n+\n+ protected function execute(InputInterface $input, OutputInterface $output): ?int\n+ {\n+ $io = new SymfonyStyle($input, $output);\n+ $rows = [];\n+\n+ $reflectedContainer = new \\ReflectionClass($this->container);\n+ $reflectionProperty = $reflectedContainer->getProperty('services');\n+ $reflectionProperty->setAccessible(true);\n+\n+ $publicServices = $reflectionProperty->getValue($this->container);\n+\n+ foreach ($publicServices as $id => $name) {\n+ $rows[] = [$id, get_class($name)];\n+ }\n+\n+ $reflectionProperty = $reflectedContainer->getProperty('privates');\n+ $reflectionProperty->setAccessible(true);\n+\n+ $privateServices = $reflectionProperty->getValue($this->container);\n+\n+ $io->text('Publicly accessible Services:');\n+ $io->table(['Service ID', 'Class name / Alias'], $rows);\n+\n+ $rows = [];\n+\n+ foreach ($privateServices as $id => $name) {\n+ $rows[] = [$id, get_class($name)];\n+ }\n+\n+ $io->text('Private Services:');\n+ $io->table(['Service ID', 'Class name / Alias'], $rows);\n+\n+ return 0;\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add `console extensions:services` command
|
95,144 |
02.11.2019 13:05:11
| -3,600 |
35944eb0a39a909826e6381562fa62be3431f38d
|
Remove large Chromedriver and Selenium binaries from repo
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -14,6 +14,10 @@ npm-debug.log\nyarn-error.log\nwebpack_stats.json\n+### Behat / Front-end testing files\n+bin/chromedriver\n+bin/selenium-server-standalone*.jar\n+\n### File-system cruft and temporary files\n__*\n._*\n"
},
{
"change_type": "DELETE",
"old_path": "chromedriver",
"new_path": "chromedriver",
"diff": "Binary files a/chromedriver and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "selenium-server-standalone-3.141.59.jar",
"new_path": "selenium-server-standalone-3.141.59.jar",
"diff": "Binary files a/selenium-server-standalone-3.141.59.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "var/log/e2e-reports/performance/.gitkeep",
"new_path": "var/log/e2e-reports/performance/.gitkeep",
"diff": ""
},
{
"change_type": "DELETE",
"old_path": "var/log/e2e-reports/report/.gitkeep",
"new_path": "var/log/e2e-reports/report/.gitkeep",
"diff": ""
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove large Chromedriver and Selenium binaries from repo
|
95,144 |
02.11.2019 16:05:32
| -3,600 |
0444e1f6ae0f5116f5010029a5690507ee65eb36
|
Custom 404 pages
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/config.yaml",
"new_path": "config/bolt/config.yaml",
"diff": "@@ -84,7 +84,7 @@ homepage_template: index.twig\n# identifiers for records, which will be tried until a match is found.\n#\n# Note: The record specified in this parameter must be set to published.\n-notfound: [ not-found.twig, block/404-not-found ]\n+notfound: [ blocks/404-not-found, 'helpers/page_404.html.twig' ]\n# The default template and amount of records to use for listing-pages on the\n# site.\n"
},
{
"change_type": "MODIFY",
"old_path": "config/packages/twig.yaml",
"new_path": "config/packages/twig.yaml",
"diff": "@@ -11,3 +11,6 @@ twig:\n'%kernel.project_dir%/templates/': 'bolt'\nglobals:\n'config': '@Bolt\\Configuration\\Config'\n+\n+ # Override Symfony's error pages (so we can show custom 404's)\n+ exception_controller: Bolt\\Controller\\ExceptionController::showAction\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -72,3 +72,10 @@ services:\nBolt\\Menu\\BackendMenuBuilderInterface: '@Bolt\\Menu\\BackendMenuBuilder'\nBolt\\Menu\\FrontendMenuBuilder: ~\nBolt\\Menu\\FrontendMenuBuilderInterface: '@Bolt\\Menu\\FrontendMenuBuilder'\n+\n+ # Override Symfony's error pages (so we can show custom 404's)\n+ Bolt\\Controller\\ExceptionController:\n+ public: true\n+ arguments:\n+ $debug: '%kernel.debug%'\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"new_path": "public/theme/skeleton/partials/_sub_field_blocks.twig",
"diff": "<ul>\n{% for record in selectedRecords %}\n<li><a href=\"{{ record|link }}\">{{ record|title }}</a></li>\n+ {% else %}\n+ <li><em>(nothing selected)</em></li>\n{% endfor %}\n</ul>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/ExceptionController.php",
"diff": "+<?php\n+\n+\n+namespace Bolt\\Controller;\n+\n+use Bolt\\Configuration\\Config;\n+use Bolt\\Controller\\Frontend\\DetailController;\n+use Bolt\\Controller\\Frontend\\TemplateController;\n+use Symfony\\Component\\Debug\\Exception\\FlattenException;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException;\n+use Symfony\\Component\\HttpKernel\\Log\\DebugLoggerInterface;\n+use Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController as SymfonyExceptionController;\n+use Twig\\Environment;\n+use Twig\\Error\\LoaderError;\n+\n+class ExceptionController extends SymfonyExceptionController\n+{\n+ /** @var Config */\n+ private $config;\n+\n+ /** @var DetailController */\n+ private $detailController;\n+\n+ /** @var TemplateController */\n+ private $templateController;\n+\n+ public function __construct(Environment $twig, bool $debug, Config $config, DetailController $detailController, TemplateController $templateController)\n+ {\n+ $this->config = $config;\n+ $this->detailController = $detailController;\n+ $this->templateController = $templateController;\n+\n+ parent::__construct($twig, $debug);\n+ }\n+\n+ public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null): Response\n+ {\n+ $code = $exception->getStatusCode();\n+\n+ if ($code == 404) {\n+ $this->twig->addGlobal('exception', $exception);\n+\n+ return $this->showNotFound();\n+ }\n+\n+ // If not a 404, we'll let Symfony handle it as usual.\n+ return parent::showAction($request, $exception, $logger);\n+ }\n+\n+ private function showNotFound()\n+ {\n+ foreach ($this->config->get('general/notfound') as $item) {\n+ $output = $this->attemptToRender($item);\n+\n+ if ($output instanceof Response) {\n+ return $output;\n+ }\n+ }\n+\n+ return new Response('Oh no');\n+ }\n+\n+ private function attemptToRender(string $item): ?Response\n+ {\n+ dump($item);\n+\n+ // First, see if it's a contenttype/slug pair:\n+ [$contentType, $slug] = explode('/', $item . '/');\n+\n+ if (!empty($contentType) && ! empty($slug)) {\n+\n+ // We wrap it in a try/catch, because we wouldn't want to\n+ // trigger a 404 within a 404 now, would we?\n+ try {\n+ return $this->detailController->record($slug, $contentType);\n+ } catch (NotFoundHttpException $e) {\n+ // Just continue to the next one.\n+ }\n+\n+ }\n+\n+ // Then, let's see if it's a template we can render.\n+ try {\n+ return $this->templateController->template($item);\n+ } catch (LoaderError $e) {\n+ // Just continue to the next one.\n+ }\n+\n+ return null;\n+ }\n+\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Controller/Frontend/TemplateController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Controller\\Frontend;\n+\n+use Bolt\\Controller\\TwigAwareController;\n+use Bolt\\Enum\\Statuses;\n+use Bolt\\Repository\\ContentRepository;\n+use Bolt\\Repository\\FieldRepository;\n+use Bolt\\TemplateChooser;\n+use Symfony\\Component\\HttpFoundation\\Response;\n+use Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException;\n+use Symfony\\Component\\Routing\\Annotation\\Route;\n+\n+class TemplateController extends TwigAwareController implements FrontendZone\n+{\n+ /** @var TemplateChooser */\n+ private $templateChooser;\n+\n+ /** @var ContentRepository */\n+ private $contentRepository;\n+\n+ /** @var FieldRepository */\n+ private $fieldRepository;\n+\n+ public function __construct(TemplateChooser $templateChooser, ContentRepository $contentRepository, FieldRepository $fieldRepository)\n+ {\n+ $this->templateChooser = $templateChooser;\n+ $this->contentRepository = $contentRepository;\n+ $this->fieldRepository = $fieldRepository;\n+ }\n+\n+ /**\n+ * Render a template. Convenient for when we simply wish to render a template as-is. Used as a\n+ * fallback for the 404 or maintenance pages, for instance.\n+ *\n+ * Note: This is _not_ assigned a Route by default. If it were, it's a potential security risk,\n+ * since a would-be attacker could try to access template files from both the theme and bolt\n+ * directly.\n+ *\n+ * @param string $templateName\n+ * @return Response\n+ * @throws \\Twig_Error_Loader\n+ * @throws \\Twig_Error_Runtime\n+ * @throws \\Twig_Error_Syntax\n+ */\n+ public function template(string $templateName): Response\n+ {\n+\n+ $templates = [ $templateName ];\n+\n+ return $this->renderTemplate($templates, []);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/FieldExtension.php",
"new_path": "src/Twig/FieldExtension.php",
"diff": "@@ -79,9 +79,12 @@ class FieldExtension extends AbstractExtension\n}\n$records = [];\n-\nforeach ($field->getValue() as $id) {\n- $records[] = $this->contentRepository->findOneBy(['id' => (int) $id]);\n+ $record = $this->contentRepository->findOneBy(['id' => (int)$id]);\n+\n+ if ($record) {\n+ $records[] = $record;\n+ }\n}\nif ($returnsingle || (! $returnarray && $definition->get('multiple') === false)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Utils/LocaleHelper.php",
"new_path": "src/Utils/LocaleHelper.php",
"diff": "@@ -54,11 +54,17 @@ class LocaleHelper\n/** @var Request $request */\n$request = $globals['app']->getRequest();\n+ $locales = new Collection();\n+\n$route = $request->attributes->get('_route');\n$routeParams = $request->attributes->get('_route_params');\n$currentLocale = $request->getLocale();\n- $locales = new Collection();\n+ // For edge-cases like '404', the `_route` is null, so we bail.\n+ if ($route === null) {\n+ return $locales;\n+ }\n+\nforeach ($localeCodes as $localeCode) {\n$locale = $this->localeInfo($localeCode);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/helpers/page_404.html.twig",
"diff": "+<!DOCTYPE html>\n+<html lang=\"en\">\n+<head>\n+ <meta charset=\"utf-8\">\n+ <title>{{ exception.statusCode }} :: {{ exception.class|split('\\\\')|last }}</title>\n+ <link rel=\"stylesheet\" href=\"https://unpkg.com/purecss@1.0.1/build/pure-min.css\" integrity=\"sha384-oAOxQR6DkCoMliIh8yFnu25d7Eq/PHS21PClpwjOTeU2jRSq11vu66rf90/cZr47\" crossorigin=\"anonymous\">\n+</head>\n+\n+<body id=\"home\">\n+\n+<div style=\"padding: 2rem 4rem;\">\n+\n+<h1>{{ exception.statusCode }} :: {{ exception.class|split('\\\\')|last }}</h1>\n+\n+<p>{{ exception.message }}</p>\n+\n+ {# will only be shown if debug is on. #}\n+ {{ dump(exception) }}\n+\n+</div>\n+</body>\n+</html>\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Custom 404 pages
|
95,144 |
02.11.2019 16:19:02
| -3,600 |
a145e1393b3af84bb46c0c651ba02bb6ebdf9552
|
Allow 404 to be 'draft' in order to work
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/ExceptionController.php",
"new_path": "src/Controller/ExceptionController.php",
"diff": "<?php\n+declare(strict_types=1);\nnamespace Bolt\\Controller;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Controller\\Frontend\\DetailController;\nuse Bolt\\Controller\\Frontend\\TemplateController;\n+use Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController as SymfonyExceptionController;\nuse Symfony\\Component\\Debug\\Exception\\FlattenException;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException;\nuse Symfony\\Component\\HttpKernel\\Log\\DebugLoggerInterface;\n-use Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController as SymfonyExceptionController;\nuse Twig\\Environment;\nuse Twig\\Error\\LoaderError;\n@@ -35,11 +36,15 @@ class ExceptionController extends SymfonyExceptionController\nparent::__construct($twig, $debug);\n}\n- public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null): Response\n+ /**\n+ * Show an exception. Mainly used for custom 404 pages, otherwise falls back\n+ * to Symfony's error handling\n+ */\n+ public function showAction(Request $request, FlattenException $exception, ?DebugLoggerInterface $logger = null): Response\n{\n$code = $exception->getStatusCode();\n- if ($code == 404) {\n+ if ($code === 404) {\n$this->twig->addGlobal('exception', $exception);\nreturn $this->showNotFound();\n@@ -64,21 +69,17 @@ class ExceptionController extends SymfonyExceptionController\nprivate function attemptToRender(string $item): ?Response\n{\n- dump($item);\n-\n// First, see if it's a contenttype/slug pair:\n[$contentType, $slug] = explode('/', $item . '/');\nif (! empty($contentType) && ! empty($slug)) {\n-\n// We wrap it in a try/catch, because we wouldn't want to\n// trigger a 404 within a 404 now, would we?\ntry {\n- return $this->detailController->record($slug, $contentType);\n+ return $this->detailController->record($slug, $contentType, false);\n} catch (NotFoundHttpException $e) {\n// Just continue to the next one.\n}\n-\n}\n// Then, let's see if it's a template we can render.\n@@ -90,6 +91,4 @@ class ExceptionController extends SymfonyExceptionController\nreturn null;\n}\n-\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/DetailController.php",
"new_path": "src/Controller/Frontend/DetailController.php",
"diff": "@@ -45,7 +45,7 @@ class DetailController extends TwigAwareController implements FrontendZone\n*\n* @param string|int $slugOrId\n*/\n- public function record($slugOrId, ?string $contentTypeSlug = null): Response\n+ public function record($slugOrId, ?string $contentTypeSlug = null, bool $requirePublished = true): Response\n{\n// @todo should we check content type?\nif (is_numeric($slugOrId)) {\n@@ -59,7 +59,8 @@ class DetailController extends TwigAwareController implements FrontendZone\n$record = $field->getContent();\n}\n- if ($record->getStatus() !== Statuses::PUBLISHED) {\n+ // If the content is not 'published' we throw a 404, unless we've overridden it.\n+ if (($record->getStatus() !== Statuses::PUBLISHED) && $requirePublished) {\nthrow new NotFoundHttpException('Content is not published');\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/TemplateController.php",
"new_path": "src/Controller/Frontend/TemplateController.php",
"diff": "@@ -5,32 +5,11 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Frontend;\nuse Bolt\\Controller\\TwigAwareController;\n-use Bolt\\Enum\\Statuses;\n-use Bolt\\Repository\\ContentRepository;\n-use Bolt\\Repository\\FieldRepository;\n-use Bolt\\TemplateChooser;\nuse Symfony\\Component\\HttpFoundation\\Response;\n-use Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nclass TemplateController extends TwigAwareController implements FrontendZone\n{\n- /** @var TemplateChooser */\n- private $templateChooser;\n-\n- /** @var ContentRepository */\n- private $contentRepository;\n-\n- /** @var FieldRepository */\n- private $fieldRepository;\n-\n- public function __construct(TemplateChooser $templateChooser, ContentRepository $contentRepository, FieldRepository $fieldRepository)\n- {\n- $this->templateChooser = $templateChooser;\n- $this->contentRepository = $contentRepository;\n- $this->fieldRepository = $fieldRepository;\n- }\n-\n/**\n* Render a template. Convenient for when we simply wish to render a template as-is. Used as a\n* fallback for the 404 or maintenance pages, for instance.\n@@ -39,15 +18,12 @@ class TemplateController extends TwigAwareController implements FrontendZone\n* since a would-be attacker could try to access template files from both the theme and bolt\n* directly.\n*\n- * @param string $templateName\n- * @return Response\n* @throws \\Twig_Error_Loader\n* @throws \\Twig_Error_Runtime\n* @throws \\Twig_Error_Syntax\n*/\npublic function template(string $templateName): Response\n{\n-\n$templates = [$templateName];\nreturn $this->renderTemplate($templates, []);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Allow 404 to be 'draft' in order to work
|
95,144 |
02.11.2019 16:23:35
| -3,600 |
2cc634f86505690d36614ee6e1032631fbcbb9d7
|
Added a fixture for the 404 page
|
[
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -101,7 +101,7 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n$preset = $this->getPreset($contentType['slug']);\nif ($i === 1 || ! empty($preset)) {\n- $content->setStatus(Statuses::PUBLISHED);\n+ $content->setStatus(isset($preset['status']) ? $preset['status'] : Statuses::PUBLISHED );\n} else {\n$content->setStatus($this->getRandomStatus());\n}\n@@ -210,6 +210,11 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n'title' => 'Search',\n'slug' => 'search',\n];\n+ $records['blocks'][] = [\n+ 'title' => '404 Page not found',\n+ 'slug' => '404-not-found',\n+ 'status' => Statuses::HELD,\n+ ];\n$records['tests'][] = [\n'selectfield' => 'bar',\n'multiselect' => 'Michelangelo',\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Added a fixture for the 404 page
|
95,144 |
03.11.2019 18:18:59
| -3,600 |
8141f67dff717ba1726d4f3d46118ee10735f179
|
Fix doctrine/dbal to 2.9.2, to prevent breakage in tests
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n\"doctrine/annotations\": \"^1.7\",\n+ \"doctrine/dbal\": \"2.9.2\",\n\"doctrine/doctrine-bundle\": \"^1.11\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n\"doctrine/orm\": \"^2.6\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix doctrine/dbal to 2.9.2, to prevent breakage in tests
|
95,144 |
03.11.2019 15:27:49
| -3,600 |
7f4baa5572efab29c97761a6c214d267ebea9245
|
Updating NPM assets
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/layout/_login.scss",
"new_path": "assets/scss/layout/_login.scss",
"diff": "}\n&.with-background {\n- background-image: url(https://source.unsplash.com/daily);\n+ background: linear-gradient(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.1)), url(https://source.unsplash.com/daily);\nbackground-position: center;\nbackground-size: cover;\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"integrity\": \"sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==\"\n},\n\"ansi-escapes\": {\n- \"version\": \"3.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz\",\n- \"integrity\": \"sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==\",\n+ \"version\": \"4.2.1\",\n+ \"resolved\": \"https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz\",\n+ \"integrity\": \"sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"type-fest\": \"^0.5.2\"\n+ },\n+ \"dependencies\": {\n+ \"type-fest\": {\n+ \"version\": \"0.5.2\",\n+ \"resolved\": \"https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz\",\n+ \"integrity\": \"sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==\",\n\"dev\": true\n+ }\n+ }\n},\n\"ansi-html\": {\n\"version\": \"0.0.7\",\n\"integrity\": \"sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==\"\n},\n\"autoprefixer\": {\n- \"version\": \"9.6.5\",\n- \"resolved\": \"https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.5.tgz\",\n- \"integrity\": \"sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g==\",\n+ \"version\": \"9.7.1\",\n+ \"resolved\": \"https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.1.tgz\",\n+ \"integrity\": \"sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw==\",\n\"requires\": {\n- \"browserslist\": \"^4.7.0\",\n- \"caniuse-lite\": \"^1.0.30000999\",\n+ \"browserslist\": \"^4.7.2\",\n+ \"caniuse-lite\": \"^1.0.30001006\",\n\"chalk\": \"^2.4.2\",\n\"normalize-range\": \"^0.1.2\",\n\"num2fraction\": \"^1.2.2\",\n- \"postcss\": \"^7.0.18\",\n+ \"postcss\": \"^7.0.21\",\n\"postcss-value-parser\": \"^4.0.2\"\n},\n\"dependencies\": {\n\"browserslist\": {\n- \"version\": \"4.7.1\",\n- \"resolved\": \"https://registry.npmjs.org/browserslist/-/browserslist-4.7.1.tgz\",\n- \"integrity\": \"sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg==\",\n+ \"version\": \"4.7.2\",\n+ \"resolved\": \"https://registry.npmjs.org/browserslist/-/browserslist-4.7.2.tgz\",\n+ \"integrity\": \"sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==\",\n\"requires\": {\n- \"caniuse-lite\": \"^1.0.30000999\",\n- \"electron-to-chromium\": \"^1.3.284\",\n- \"node-releases\": \"^1.1.36\"\n+ \"caniuse-lite\": \"^1.0.30001004\",\n+ \"electron-to-chromium\": \"^1.3.295\",\n+ \"node-releases\": \"^1.1.38\"\n}\n},\n\"caniuse-lite\": {\n- \"version\": \"1.0.30000999\",\n- \"resolved\": \"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz\",\n- \"integrity\": \"sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==\"\n+ \"version\": \"1.0.30001006\",\n+ \"resolved\": \"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz\",\n+ \"integrity\": \"sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==\"\n},\n\"electron-to-chromium\": {\n- \"version\": \"1.3.285\",\n- \"resolved\": \"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.285.tgz\",\n- \"integrity\": \"sha512-DYR9KW723sUbGK++DCmCmM95AbNXT4Q0tlCFMcYijFjayhuDqlGYR68OemlP8MJj0gjkwdeItIUfd0oLCgw+4A==\"\n+ \"version\": \"1.3.302\",\n+ \"resolved\": \"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.302.tgz\",\n+ \"integrity\": \"sha512-1qConyiVEbj4xZRBXqtGR003+9tV0rJF0PS6aeO0Ln/UL637js9hdwweCl07meh/kJoI2N4W8q3R3g3F5z46ww==\"\n},\n\"node-releases\": {\n- \"version\": \"1.1.36\",\n- \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.36.tgz\",\n- \"integrity\": \"sha512-ggXhX6QGyJSjj3r+6ml2LqqC28XOWmKtpb+a15/Zpr9V3yoNazxJNlcQDS9bYaid5FReEWHEgToH1mwoUceWwg==\",\n+ \"version\": \"1.1.39\",\n+ \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz\",\n+ \"integrity\": \"sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==\",\n\"requires\": {\n\"semver\": \"^6.3.0\"\n}\n},\n\"postcss\": {\n- \"version\": \"7.0.18\",\n- \"resolved\": \"https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz\",\n- \"integrity\": \"sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==\",\n+ \"version\": \"7.0.21\",\n+ \"resolved\": \"https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz\",\n+ \"integrity\": \"sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==\",\n\"requires\": {\n\"chalk\": \"^2.4.2\",\n\"source-map\": \"^0.6.1\",\n}\n},\n\"is-buffer\": {\n- \"version\": \"2.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz\",\n- \"integrity\": \"sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==\"\n+ \"version\": \"2.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz\",\n+ \"integrity\": \"sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==\"\n},\n\"ms\": {\n\"version\": \"2.0.0\",\n\"integrity\": \"sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=\"\n},\n\"codemirror\": {\n- \"version\": \"5.49.0\",\n- \"resolved\": \"https://registry.npmjs.org/codemirror/-/codemirror-5.49.0.tgz\",\n- \"integrity\": \"sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA==\"\n+ \"version\": \"5.49.2\",\n+ \"resolved\": \"https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz\",\n+ \"integrity\": \"sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ==\"\n},\n\"codemirror-spell-checker\": {\n\"version\": \"1.1.2\",\n}\n},\n\"eslint\": {\n- \"version\": \"6.5.1\",\n- \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz\",\n- \"integrity\": \"sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==\",\n+ \"version\": \"6.6.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz\",\n+ \"integrity\": \"sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/code-frame\": \"^7.0.0\",\n\"debug\": \"^4.0.1\",\n\"doctrine\": \"^3.0.0\",\n\"eslint-scope\": \"^5.0.0\",\n- \"eslint-utils\": \"^1.4.2\",\n+ \"eslint-utils\": \"^1.4.3\",\n\"eslint-visitor-keys\": \"^1.1.0\",\n- \"espree\": \"^6.1.1\",\n+ \"espree\": \"^6.1.2\",\n\"esquery\": \"^1.0.1\",\n\"esutils\": \"^2.0.2\",\n\"file-entry-cache\": \"^5.0.1\",\n\"ignore\": \"^4.0.6\",\n\"import-fresh\": \"^3.0.0\",\n\"imurmurhash\": \"^0.1.4\",\n- \"inquirer\": \"^6.4.1\",\n+ \"inquirer\": \"^7.0.0\",\n\"is-glob\": \"^4.0.0\",\n\"js-yaml\": \"^3.13.1\",\n\"json-stable-stringify-without-jsonify\": \"^1.0.1\",\n}\n},\n\"eslint-config-prettier\": {\n- \"version\": \"6.4.0\",\n- \"resolved\": \"https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz\",\n- \"integrity\": \"sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==\",\n+ \"version\": \"6.5.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz\",\n+ \"integrity\": \"sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ==\",\n\"dev\": true,\n\"requires\": {\n\"get-stdin\": \"^6.0.0\"\n}\n},\n\"eslint-utils\": {\n- \"version\": \"1.4.2\",\n- \"resolved\": \"https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz\",\n- \"integrity\": \"sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==\",\n+ \"version\": \"1.4.3\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz\",\n+ \"integrity\": \"sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==\",\n\"dev\": true,\n\"requires\": {\n- \"eslint-visitor-keys\": \"^1.0.0\"\n+ \"eslint-visitor-keys\": \"^1.1.0\"\n+ },\n+ \"dependencies\": {\n+ \"eslint-visitor-keys\": {\n+ \"version\": \"1.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz\",\n+ \"integrity\": \"sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==\",\n+ \"dev\": true\n+ }\n}\n},\n\"eslint-visitor-keys\": {\n\"dev\": true\n},\n\"espree\": {\n- \"version\": \"6.1.1\",\n- \"resolved\": \"https://registry.npmjs.org/espree/-/espree-6.1.1.tgz\",\n- \"integrity\": \"sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==\",\n+ \"version\": \"6.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/espree/-/espree-6.1.2.tgz\",\n+ \"integrity\": \"sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==\",\n\"dev\": true,\n\"requires\": {\n- \"acorn\": \"^7.0.0\",\n- \"acorn-jsx\": \"^5.0.2\",\n+ \"acorn\": \"^7.1.0\",\n+ \"acorn-jsx\": \"^5.1.0\",\n\"eslint-visitor-keys\": \"^1.1.0\"\n},\n\"dependencies\": {\n\"dev\": true\n},\n\"acorn-jsx\": {\n- \"version\": \"5.0.2\",\n- \"resolved\": \"https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz\",\n- \"integrity\": \"sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==\",\n+ \"version\": \"5.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz\",\n+ \"integrity\": \"sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==\",\n\"dev\": true\n},\n\"eslint-visitor-keys\": {\n\"integrity\": \"sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==\"\n},\n\"figures\": {\n- \"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/figures/-/figures-2.0.0.tgz\",\n- \"integrity\": \"sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=\",\n+ \"version\": \"3.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/figures/-/figures-3.1.0.tgz\",\n+ \"integrity\": \"sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==\",\n\"dev\": true,\n\"requires\": {\n\"escape-string-regexp\": \"^1.0.5\"\n\"integrity\": \"sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==\"\n},\n\"highlight.js\": {\n- \"version\": \"9.15.10\",\n- \"resolved\": \"https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz\",\n- \"integrity\": \"sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==\"\n+ \"version\": \"9.16.2\",\n+ \"resolved\": \"https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz\",\n+ \"integrity\": \"sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==\"\n},\n\"hmac-drbg\": {\n\"version\": \"1.0.1\",\n\"dev\": true\n},\n\"inquirer\": {\n- \"version\": \"6.5.2\",\n- \"resolved\": \"https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz\",\n- \"integrity\": \"sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==\",\n+ \"version\": \"7.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz\",\n+ \"integrity\": \"sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==\",\n\"dev\": true,\n\"requires\": {\n- \"ansi-escapes\": \"^3.2.0\",\n+ \"ansi-escapes\": \"^4.2.1\",\n\"chalk\": \"^2.4.2\",\n- \"cli-cursor\": \"^2.1.0\",\n+ \"cli-cursor\": \"^3.1.0\",\n\"cli-width\": \"^2.0.0\",\n\"external-editor\": \"^3.0.3\",\n- \"figures\": \"^2.0.0\",\n- \"lodash\": \"^4.17.12\",\n- \"mute-stream\": \"0.0.7\",\n+ \"figures\": \"^3.0.0\",\n+ \"lodash\": \"^4.17.15\",\n+ \"mute-stream\": \"0.0.8\",\n\"run-async\": \"^2.2.0\",\n\"rxjs\": \"^6.4.0\",\n- \"string-width\": \"^2.1.0\",\n+ \"string-width\": \"^4.1.0\",\n\"strip-ansi\": \"^5.1.0\",\n\"through\": \"^2.3.6\"\n},\n\"integrity\": \"sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==\",\n\"dev\": true\n},\n+ \"cli-cursor\": {\n+ \"version\": \"3.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz\",\n+ \"integrity\": \"sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"restore-cursor\": \"^3.1.0\"\n+ }\n+ },\n+ \"emoji-regex\": {\n+ \"version\": \"8.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz\",\n+ \"integrity\": \"sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==\",\n+ \"dev\": true\n+ },\n+ \"is-fullwidth-code-point\": {\n+ \"version\": \"3.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz\",\n+ \"integrity\": \"sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==\",\n+ \"dev\": true\n+ },\n+ \"mimic-fn\": {\n+ \"version\": \"2.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz\",\n+ \"integrity\": \"sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==\",\n+ \"dev\": true\n+ },\n+ \"onetime\": {\n+ \"version\": \"5.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz\",\n+ \"integrity\": \"sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"mimic-fn\": \"^2.1.0\"\n+ }\n+ },\n+ \"restore-cursor\": {\n+ \"version\": \"3.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz\",\n+ \"integrity\": \"sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"onetime\": \"^5.1.0\",\n+ \"signal-exit\": \"^3.0.2\"\n+ }\n+ },\n+ \"string-width\": {\n+ \"version\": \"4.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz\",\n+ \"integrity\": \"sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"emoji-regex\": \"^8.0.0\",\n+ \"is-fullwidth-code-point\": \"^3.0.0\",\n+ \"strip-ansi\": \"^5.2.0\"\n+ }\n+ },\n\"strip-ansi\": {\n\"version\": \"5.2.0\",\n\"resolved\": \"https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz\",\n}\n},\n\"luxon\": {\n- \"version\": \"1.19.3\",\n- \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.19.3.tgz\",\n- \"integrity\": \"sha512-YwTDjGRQC0QC9Iya2g2eKZfgEFqRId4ZoLHORQcfTMB/5xrTx427V7ZPjQJ1vzvhA2vJfG2bh1Kv8V8IFMWCUA==\"\n+ \"version\": \"1.21.0\",\n+ \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.21.0.tgz\",\n+ \"integrity\": \"sha512-GkS6D9prDlacKi062DW/OxVI7i+CKgfBc2uDqI//UH1VwPPlgYiMwfoP5uHK3UfzdjXgbwmEwZHWIGgLcg/APg==\"\n},\n\"make-dir\": {\n\"version\": \"1.3.0\",\n\"integrity\": \"sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=\"\n},\n\"mute-stream\": {\n- \"version\": \"0.0.7\",\n- \"resolved\": \"https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz\",\n- \"integrity\": \"sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=\",\n+ \"version\": \"0.0.8\",\n+ \"resolved\": \"https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz\",\n+ \"integrity\": \"sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==\",\n\"dev\": true\n},\n\"mz\": {\n}\n},\n\"node-sass\": {\n- \"version\": \"4.12.0\",\n- \"resolved\": \"https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz\",\n- \"integrity\": \"sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==\",\n+ \"version\": \"4.13.0\",\n+ \"resolved\": \"https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz\",\n+ \"integrity\": \"sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==\",\n\"dev\": true,\n\"requires\": {\n\"async-foreach\": \"^0.1.3\",\n\"get-stdin\": \"^4.0.1\",\n\"glob\": \"^7.0.3\",\n\"in-publish\": \"^2.0.0\",\n- \"lodash\": \"^4.17.11\",\n+ \"lodash\": \"^4.17.15\",\n\"meow\": \"^3.7.0\",\n\"mkdirp\": \"^0.5.1\",\n\"nan\": \"^2.13.2\",\n}\n},\n\"stylelint-scss\": {\n- \"version\": \"3.11.1\",\n- \"resolved\": \"https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.11.1.tgz\",\n- \"integrity\": \"sha512-0FZNSfy5X2Or4VRA3Abwfrw1NHrI6jHT8ji9xSwP8Re2Kno0i90qbHwm8ohPO0kRB1RP9x1vCYBh4Tij+SZjIg==\",\n+ \"version\": \"3.12.1\",\n+ \"resolved\": \"https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.12.1.tgz\",\n+ \"integrity\": \"sha512-k6B78HrqJ6pib5yOtmId7osVGrE2Amcf0VU+tdzk+oqwXe/0+VKtbkogeXrmGKt+z54QhxvjEO++qlE/a7EWlA==\",\n\"requires\": {\n\"lodash\": \"^4.17.15\",\n\"postcss-media-query-parser\": \"^0.2.3\",\n}\n},\n\"trumbowyg\": {\n- \"version\": \"2.18.0\",\n- \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.18.0.tgz\",\n- \"integrity\": \"sha512-0C6J3uYE3a9JO1IZdlOVQqTEvzvPA798jHM1Wxiixsr+UIFQNP+fFVYSZqTlO5i3WIiWHJzk3klRczyhHDUnKA==\"\n+ \"version\": \"2.19.1\",\n+ \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.19.1.tgz\",\n+ \"integrity\": \"sha512-9e/pS03vbTjQkBCHxoo8VVeIhZzTkFcItnRDhruw4Q5K3jbnYXojTw88PE7hK7WljtWAtmlGm2bByOxyrZpw7g==\"\n},\n\"tryer\": {\n\"version\": \"1.0.1\",\n}\n},\n\"vue-flatpickr-component\": {\n- \"version\": \"8.1.4\",\n- \"resolved\": \"https://registry.npmjs.org/vue-flatpickr-component/-/vue-flatpickr-component-8.1.4.tgz\",\n- \"integrity\": \"sha512-+7fQITZAPs42l4q0VUDXyqJ5UK0HPTescSLbRB8JbwVJXFjYv9i79w0MjYHwOL8S6UKh27zxZ/+yZBhgmv+nbg==\",\n+ \"version\": \"8.1.5\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-flatpickr-component/-/vue-flatpickr-component-8.1.5.tgz\",\n+ \"integrity\": \"sha512-whrR+WM7fWyHW+1ZxCx7uVSuOlTeZXEMzhsgcILXGxIzQxr5uX5RlS5amLXdGGSSVf+zukrb6MvYit/uIkhk3Q==\",\n\"requires\": {\n\"flatpickr\": \"^4.6.1\"\n}\n},\n\"vue-hot-reload-api\": {\n- \"version\": \"2.3.3\",\n- \"resolved\": \"https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz\",\n- \"integrity\": \"sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==\"\n+ \"version\": \"2.3.4\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz\",\n+ \"integrity\": \"sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==\"\n},\n\"vue-jest\": {\n\"version\": \"3.0.5\",\n}\n},\n\"vue-loader\": {\n- \"version\": \"15.7.1\",\n- \"resolved\": \"https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.1.tgz\",\n- \"integrity\": \"sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==\",\n+ \"version\": \"15.7.2\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.2.tgz\",\n+ \"integrity\": \"sha512-H/P9xt/nkocyu4hZKg5TzPqyCT1oKOaCSk9zs0JCbJuy0Q8KtR0bjJpnT/5R5x/Ckd1GFkkLQnQ1C4x6xXeLZg==\",\n\"requires\": {\n\"@vue/component-compiler-utils\": \"^3.0.0\",\n\"hash-sum\": \"^1.0.2\",\n\"loader-utils\": \"^1.1.0\",\n\"vue-hot-reload-api\": \"^2.3.0\",\n\"vue-style-loader\": \"^4.1.0\"\n- },\n- \"dependencies\": {\n- \"@vue/component-compiler-utils\": {\n- \"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz\",\n- \"integrity\": \"sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==\",\n- \"requires\": {\n- \"consolidate\": \"^0.15.1\",\n- \"hash-sum\": \"^1.0.2\",\n- \"lru-cache\": \"^4.1.2\",\n- \"merge-source-map\": \"^1.1.0\",\n- \"postcss\": \"^7.0.14\",\n- \"postcss-selector-parser\": \"^5.0.0\",\n- \"prettier\": \"1.16.3\",\n- \"source-map\": \"~0.6.1\",\n- \"vue-template-es2015-compiler\": \"^1.9.0\"\n- }\n- },\n- \"lru-cache\": {\n- \"version\": \"4.1.5\",\n- \"resolved\": \"https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz\",\n- \"integrity\": \"sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==\",\n- \"requires\": {\n- \"pseudomap\": \"^1.0.2\",\n- \"yallist\": \"^2.1.2\"\n- }\n- },\n- \"prettier\": {\n- \"version\": \"1.16.3\",\n- \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz\",\n- \"integrity\": \"sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==\"\n- },\n- \"yallist\": {\n- \"version\": \"2.1.2\",\n- \"resolved\": \"https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz\",\n- \"integrity\": \"sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=\"\n- }\n}\n},\n\"vue-multiselect\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"baguettebox.js\": \"^1.11.0\",\n\"bootbox\": \"^5.3.2\",\n\"bootstrap\": \"^4.3.1\",\n- \"codemirror\": \"^5.49.0\",\n+ \"codemirror\": \"^5.49.2\",\n\"dropzone\": \"^5.5.1\",\n\"flagpack\": \"^1.0.4\",\n\"jquery\": \"^3.4.1\",\n- \"luxon\": \"^1.19.3\",\n+ \"luxon\": \"^1.21.0\",\n\"no-scroll\": \"^2.1.1\",\n\"popper.js\": \"^1.16.0\",\n\"register-service-worker\": \"^1.6.2\",\n\"selectize\": \"^0.12.6\",\n\"simplemde\": \"^1.11.2\",\n\"stylelint-config-recommended-scss\": \"^4.0.0\",\n- \"stylelint-scss\": \"^3.11.1\",\n+ \"stylelint-scss\": \"^3.12.1\",\n\"terser\": \"^4.3.9\",\n\"tinycolor2\": \"^1.4.1\",\n\"vue\": \"^2.6.10\",\n- \"vue-flatpickr-component\": \"^8.1.4\",\n+ \"vue-flatpickr-component\": \"^8.1.5\",\n\"vue-multiselect\": \"^2.1.6\",\n\"vue-simplemde\": \"^1.0.0\",\n\"vue-trumbowyg\": \"^3.4.2\",\n\"@symfony/webpack-encore\": \"^0.28.0\",\n\"@vue/test-utils\": \"^1.0.0-beta.29\",\n\"ajv-keywords\": \"^3.4.1\",\n- \"autoprefixer\": \"^9.6.5\",\n+ \"autoprefixer\": \"^9.7.1\",\n\"babel-core\": \"^7.0.0-bridge.0\",\n\"babel-eslint\": \"^10.0.3\",\n\"babel-jest\": \"^24.9.0\",\n- \"eslint\": \"^6.5.1\",\n- \"eslint-config-prettier\": \"^6.4.0\",\n+ \"eslint\": \"^6.6.0\",\n+ \"eslint-config-prettier\": \"^6.5.0\",\n\"eslint-plugin-prettier\": \"^3.1.1\",\n\"eslint-plugin-standard\": \"^4.0.1\",\n\"eslint-plugin-vue\": \"^5.2.3\",\n\"jest\": \"^24.9.0\",\n\"jest-serializer-vue\": \"^2.0.2\",\n- \"node-sass\": \"^4.12.0\",\n+ \"node-sass\": \"^4.13.0\",\n\"postcss-loader\": \"^3.0.0\",\n\"postcss-preset-env\": \"^6.7.0\",\n\"prettier\": \"^1.18.2\",\n\"stylelint\": \"^11.1.1\",\n\"stylelint-config-standard\": \"^19.0.0\",\n\"vue-jest\": \"^3.0.5\",\n- \"vue-loader\": \"^15.7.1\",\n+ \"vue-loader\": \"^15.7.2\",\n\"vue-router\": \"^3.1.3\",\n\"vue-template-compiler\": \"^2.6.10\",\n\"webpackbar\": \"^4.0.0\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating NPM assets
|
95,144 |
04.11.2019 21:04:19
| -3,600 |
b29d9c93aa7028c17d1288d64a215a30085bc1a2
|
Don't run an Extension's `initialize` on CLI
|
[
{
"change_type": "MODIFY",
"old_path": "src/Command/ExtensionsServicesCommand.php",
"new_path": "src/Command/ExtensionsServicesCommand.php",
"diff": "@@ -50,7 +50,7 @@ class ExtensionsServicesCommand extends Command\n$privateServices = $reflectionProperty->getValue($this->container);\n- $io->text('Publicly accessible Services:');\n+ $io->text('Publicly accessible Services <info>(' . count($rows) . ')</info>:');\n$io->table(['Service ID', 'Class name / Alias'], $rows);\n$rows = [];\n@@ -59,7 +59,7 @@ class ExtensionsServicesCommand extends Command\n$rows[] = [$id, get_class($name)];\n}\n- $io->text('Private Services:');\n+ $io->text('Private Services <info>(' . count($rows) . ')</info>:');\n$io->table(['Service ID', 'Class name / Alias'], $rows);\nreturn 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Event/Subscriber/ExtensionSubscriber.php",
"new_path": "src/Event/Subscriber/ExtensionSubscriber.php",
"diff": "@@ -46,7 +46,7 @@ class ExtensionSubscriber implements EventSubscriberInterface\n*/\npublic function onConsoleResponse(ConsoleCommandEvent $event): void\n{\n- $this->extensionRegistry->initializeAll($this->objects);\n+ $this->extensionRegistry->initializeAll($this->objects, true);\n}\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Don't run an Extension's `initialize` on CLI
|
95,144 |
12.11.2019 17:46:19
| -3,600 |
951abc1e866d1dfbdbebc5cda44395bee1dd60c4
|
Bump version of PHP and Doctrine
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -12,10 +12,6 @@ cache:\nmatrix:\nfast_finish: true\ninclude:\n- # Pinned to 7.1.18, because Travis defaults to 7.1.6, which has broken SSL/TLS. See: https://github.com/travis-ci/travis-ci/issues/6339\n- - php: 7.1.18\n- - php: 7.1.18\n- env: COMPOSER_FLAGS=\"--prefer-lowest\"\n- php: 7.2\n- php: 7.3\n- php: 7.4snapshot\n@@ -24,8 +20,6 @@ matrix:\nallow_failures:\n- php: 7.4snapshot\n- php: nightly\n- - php: 7.1.18\n- env: COMPOSER_FLAGS=\"--prefer-lowest\"\nbefore_install:\n- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo \"xdebug not available\"\n@@ -77,5 +71,3 @@ script:\n- make behat-api\n# run JS e2e tests\n- ./run_behat_tests.sh && make behat-js\n-\n-\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Bump version of PHP and Doctrine
|
95,144 |
15.11.2019 13:56:24
| -3,600 |
f4b5df078a774105ddf1699774680dc830921610
|
Bump PHP version in PhpUnit config
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -282,6 +282,9 @@ blocks:\ncontent:\ntype: html\nheight: 150px\n+ imagelist:\n+ type: imagelist\n+ group: Imagelist\nrelations:\npages:\nmultiple: false\n"
},
{
"change_type": "MODIFY",
"old_path": "phpunit.xml.dist",
"new_path": "phpunit.xml.dist",
"diff": "<env name=\"APP_ENV\" value=\"test\" force=\"true\"/>\n<env name=\"APP_DEBUG\" value=\"1\" force=\"true\"/>\n<env name=\"APP_SECRET\" value=\"5a79a1c866efef9ca1800f971d689f3e\"/>\n- <env name=\"SYMFONY_PHPUNIT_VERSION\" value=\"7.1\"/>\n+ <env name=\"SYMFONY_PHPUNIT_VERSION\" value=\"7.2\"/>\n<!-- define your env variables for the test env here -->\n<!-- ###+ doctrine/doctrine-bundle ### -->\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Bump PHP version in PhpUnit config
|
95,144 |
16.11.2019 15:30:22
| -3,600 |
6257c397d7cb30f201021678dc80bded1205c6a5
|
Update "summary" fields in image editor
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -15,8 +15,8 @@ yarn-error.log\nwebpack_stats.json\n### Behat / Front-end testing files\n-bin/chromedriver\n-bin/selenium-server-standalone*.jar\n+bin/chromedriver*\n+bin/selenium-server-standalone*\n### File-system cruft and temporary files\n__*\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_fields_aside_summary.html.twig",
"new_path": "templates/content/_fields_aside_summary.html.twig",
"diff": "'label' : 'field.createdAt'|trans,\n'name' : 'createdAt',\n'value' : record.createdAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent',\n'valueonly' : true\n} %}\n</li>\n'label' : 'field.modifiedAt'|trans,\n'name' : 'modifiedAt',\n'value' : record.modifiedAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'form' : 'editcontent',\n'valueonly' : true\n} %}\n</li>\n'label' : 'field.id'|trans,\n'name' : 'id',\n'value' : record.id,\n- 'disabled' : true,\n'valueonly' : true\n} %}\n</li>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/media/edit.html.twig",
"new_path": "templates/media/edit.html.twig",
"diff": "'label': 'field.id'|trans,\n'name': 'id',\n'value': media.id,\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'valueonly' : true,\n} %}\n{% include '@bolt/_partials/fields/text.html.twig' with {\n'label': 'field.width'|trans,\n'name': 'width',\n- 'value': media.width,\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'value': media.width ~ ' pixels',\n+ 'valueonly' : true,\n} %}\n{% include '@bolt/_partials/fields/text.html.twig' with {\n'label': 'field.height'|trans,\n'name': 'height',\n- 'value': media.height,\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'value': media.height ~ ' pixels',\n+ 'valueonly' : true,\n} %}\n{% include '@bolt/_partials/fields/text.html.twig' with {\n'label': 'field.filesize'|trans,\n'name': 'filesize',\n- 'value': media.filesize,\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'value': media.filesize ~ ' bytes',\n+ 'valueonly' : true,\n} %}\n{#<input type=\"text\" name=\"author\" value=\"{{ media.author }}\">#}\n'label': 'field.createdAt'|trans,\n'name': 'createdAt',\n'value': media.createdAt,\n- 'disabled' : true,\n- 'mode' : 'datetime',\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'valueonly' : true,\n+\n} %}\n{% include '@bolt/_partials/fields/date.html.twig' with {\n'label': 'field.modifiedAt'|trans,\n'name': 'modifiedAt',\n'value': media.modifiedAt,\n- 'mode' : 'datetime',\n- 'disabled' : true,\n- 'attributes': 'readonly form=\"editcontent\"',\n+ 'valueonly' : true,\n} %}\n</form>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update "summary" fields in image editor
|
95,144 |
15.11.2019 17:44:28
| -3,600 |
85549df889a495d20f715b4ec6745228fb42bb10
|
Remove Title attribute from Image field
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Image.vue",
"new_path": "assets/js/app/editor/Components/Image.vue",
"diff": "</div>\n</transition>\n<div class=\"row\">\n- <div class=\"col-8\">\n+ <div class=\"col-9\">\n<div class=\"input-group mb-3\">\n<input :name=\"name + '[media]'\" type=\"hidden\" :value=\"media\" />\n<input\n:value=\"alt\"\n/>\n</div>\n- <div class=\"input-group mb-3\">\n- <input\n- class=\"form-control\"\n- :name=\"name + '[title]'\"\n- type=\"text\"\n- :placeholder=\"labels.placeholder_title\"\n- :value=\"title\"\n- />\n- </div>\n<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button\n></div>\n</div>\n</div>\n- <div class=\"col-4\">\n+ <div class=\"col-3\">\n<div class=\"editor__image--preview\">\n<a\nclass=\"editor__image--preview-image\"\n@@ -119,7 +110,6 @@ export default {\n'name',\n'thumbnail',\n'alt',\n- 'title',\n'directory',\n'media',\n'csrfToken',\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Imagelist.vue",
"new_path": "assets/js/app/editor/Components/Imagelist.vue",
"diff": "<template>\n<div>\n- <div v-for=\"(child, index) in this.containerImages\" :key=\"index\">\n+ <div v-for=\"(child, index) in this.containerImages\" :key=\"index\" class=\"form-fieldsgroup\">\n<editor-image\nv-if=\"child.hidden !== true\"\n:filename=\"child.filename\"\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/_forms.scss",
"new_path": "assets/scss/modules/editor/_forms.scss",
"diff": ".summary-fields {\npadding-left: 1rem;\n}\n+\n+.form-fieldset {\n+ border-left: 0.5rem solid #dddddd;\n+ padding-left: 1rem;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/fields/_image.scss",
"new_path": "assets/scss/modules/editor/fields/_image.scss",
"diff": "&--preview-image {\ndisplay: block;\nwidth: 100%;\n- height: 200px;\n+ height: 150px;\nborder-radius: $border-radius;\nbackground-color: var(--shade-300);\nbackground-size: cover;\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "}\n},\n\"make-fetch-happen\": {\n- \"version\": \"5.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.1.tgz\",\n- \"integrity\": \"sha512-b4dfaMvUDR67zxUq1+GN7Ke9rH5WvGRmoHuMH7l+gmUCR2tCXFP6mpeJ9Dp+jB6z8mShRopSf1vLRBhRs8Cu5w==\",\n+ \"version\": \"5.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz\",\n+ \"integrity\": \"sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==\",\n\"requires\": {\n\"agentkeepalive\": \"^3.4.1\",\n\"cacache\": \"^12.0.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/ImageField.php",
"new_path": "src/Entity/Field/ImageField.php",
"diff": "@@ -24,7 +24,6 @@ class ImageField extends Field implements FieldInterface\n$this->fieldBase = [\n'filename' => '',\n'alt' => '',\n- 'title' => '',\n'path' => '',\n'media' => '',\n'thumbnail' => '',\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_base.html.twig",
"new_path": "templates/_partials/fields/_base.html.twig",
"diff": "{# Set type #}\n{% set type = field.type|default %}\n+{% if type in ['imagelist', 'filelist', 'collection'] %}\n+ {% set fieldset = true %}\n+{% else %}\n+ {% set fieldset = false %}\n+{% endif %}\n+\n{# Set variant #}\n{% set variant = field.definition.variant|default('normal') %}\n{%- endapply -%}\n<!-- field \"{{ label }}\" (type: {{ type }}{% if variant != 'normal' %}, variant: {{ variant }}{% endif %}) -->\n-<div class=\"form-group editor--group is-{{ variant }}\">\n+<div class=\"form-group {{ fieldset ? 'form-fieldset' }} is-{{ variant }}\">\n{{ prefix|raw }}\n{% block label %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/geolocation.html.twig",
"new_path": "templates/_partials/fields/geolocation.html.twig",
"diff": "null\n{% endif %}\n- <div class=\"form-group editor--group\">\n- <label for=\"field-geolocation\">{{ 'geolocation.label_geolocation'|trans }}</label>\n<div class=\"editor__geolocation\">\n<div class=\"row\">\n<div class=\"col-8\">\n</div>\n</div>\n</div>\n- </div>\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/image.html.twig",
"new_path": "templates/_partials/fields/image.html.twig",
"diff": "'button_from_library': 'image.button_from_library'|trans,\n'placeholder_filename': 'image.placeholder_filename'|trans,\n'placeholder_alt_text': 'image.placeholder_alt_text'|trans,\n- 'placeholder_title': 'image.placeholder_title'|trans,\n}|json_encode %}\n{% set extensions = field.definition.get('extensions')|default('') %}\n<editor-image\n:name='{{ name|json_encode }}'\n:filename='{{ field.get('filename')|json_encode }}'\n:thumbnail='{{ field|thumbnail(width=400, height=300)|json_encode }}'\n- :title='{{ field.get('title')|json_encode }}'\n:alt='{{ field.get('alt')|json_encode }}'\n:media='{{ field.get('media')|json_encode }}'\n:directory='{{ directory|json_encode }}'\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_relationships.html.twig",
"new_path": "templates/content/_relationships.html.twig",
"diff": "{% set options = related_options(contentType) %}\n{% set value = record|related_values(contentType) %}\n- <div class=\"form-group editor--group is-normal\">\n+ <div class=\"form-group is-normal\">\n<label for=\"field-title\">\n{{ relation.label }}:\n</label>\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_taxonomies.html.twig",
"new_path": "templates/content/_taxonomies.html.twig",
"diff": "{% set options = taxonomyoptions(definition) %}\n{% set value = taxonomyvalues(record.taxonomies, definition) %}\n- <div class=\"form-group editor--group is-normal\">\n+ <div class=\"form-group is-normal\">\n<label for=\"field-title\">\n{{ definition.name }}:\n</label>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Remove Title attribute from Image field
|
95,144 |
16.11.2019 18:01:41
| -3,600 |
e23ae464744772e83f119e677f83f52f6876d8d5
|
Add "edit attributes" button
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Image.vue",
"new_path": "assets/js/app/editor/Components/Image.vue",
"diff": "<i class=\"fas fa-fw fa-times\"></i> {{ labels.button_remove }}\n</button>\n</div>\n+\n+ <div v-if=\"filename\" class=\"btn-group mr-2\" role=\"group\">\n+ <a\n+ class=\"btn btn-info\"\n+ :href=\"attributesLink + '?file=' + filename\"\n+ target=\"_blank\"\n+ >\n+ <i class=\"fas fa-fw fa-info-circle\"></i>\n+ {{ labels.button_edit_attributes }}\n+ </a>\n+ </div>\n</div>\n<div v-if=\"progress > 0\" class=\"progress mt-3\">\n<div\n@@ -117,6 +128,7 @@ export default {\n'filelist',\n'extensions',\n'removable',\n+ 'attributesLink',\n],\ndata: () => {\nreturn {\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Imagelist.vue",
"new_path": "assets/js/app/editor/Components/Imagelist.vue",
"diff": ":thumbnail=\"child.thumbnail\"\n:title=\"child.title\"\n:alt=\"child.alt\"\n+ :attributes-link=\"attributesLink\"\n:media=\"child.media\"\n:directory=\"directory\"\n:filelist=\"filelist\"\n@@ -44,6 +45,7 @@ export default {\n'csrfToken',\n'labels',\n'extensions',\n+ 'attributesLink',\n],\ndata: function() {\nreturn {\n"
},
{
"change_type": "MODIFY",
"old_path": "config/bolt/contenttypes.yaml",
"new_path": "config/bolt/contenttypes.yaml",
"diff": "@@ -278,6 +278,8 @@ blocks:\nslug:\ntype: slug\nuses: [ title ]\n+ imagelist:\n+ type: imagelist\ncontent:\ntype: html\nheight: 150px\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/MediaEditController.php",
"new_path": "src/Controller/Backend/MediaEditController.php",
"diff": "@@ -98,12 +98,12 @@ class MediaEditController extends TwigAwareController implements BackendZone\n*/\npublic function new(Request $request): RedirectResponse\n{\n- $fileLocation = $request->query->get('location');\n+ $fileLocation = $request->query->get('location', 'files');\n$basepath = $this->fileLocations->get($fileLocation)->getBasepath();\n- $file = $request->query->get('file');\n+ $file = '/' . $request->query->get('file');\n$filename = $basepath . $file;\n- $relPath = Path::getDirectory($file);\n+ $relPath = Path::getDirectory('/' . $file);\n$relName = Path::getFilename($file);\n$file = new SplFileInfo($filename, $relPath, $relName);\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/image.html.twig",
"new_path": "templates/_partials/fields/image.html.twig",
"diff": "'button_from_library': 'image.button_from_library'|trans,\n'placeholder_filename': 'image.placeholder_filename'|trans,\n'placeholder_alt_text': 'image.placeholder_alt_text'|trans,\n+ 'button_edit_attributes': 'image.button_edit_attributes'|trans,\n}|json_encode %}\n{% set extensions = field.definition.get('extensions')|default('') %}\n<editor-image\n:csrf-token='{{ csrf_token('upload')|json_encode }}'\n:labels='{{ labels }}'\n:extensions='{{ extensions|json_encode }}'\n+ :attributes-link='{{ path('bolt_media_new')|json_encode }}'\n></editor-image>\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/imagelist.html.twig",
"new_path": "templates/_partials/fields/imagelist.html.twig",
"diff": "'placeholder_alt_text': 'image.placeholder_alt_text'|trans,\n'placeholder_title': 'image.placeholder_title'|trans,\n'button_remove': 'image.button_remove'|trans,\n+ 'button_edit_attributes': 'image.button_edit_attributes'|trans,\n}|json_encode %}\n{% set extensions = field.definition.get('extensions')|default('') %}\n:csrf-token='{{ csrf_token('upload')|json_encode }}'\n:labels='{{ labels }}'\n:extensions='{{ extensions|json_encode }}'\n+ :attributes-link='{{ path('bolt_media_new')|json_encode }}'\n></editor-imagelist>\n{% endblock %}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<target>Remove</target>\n</segment>\n</unit>\n+ <unit id=\"eHV6ZJB\" name=\"image.button_edit_attributes\">\n+ <segment>\n+ <source>image.button_edit_attributes</source>\n+ <target>Edit attributes</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add "edit attributes" button
|
95,144 |
17.11.2019 13:05:21
| -3,600 |
4efa387b35f93318ac998f7942452c40a2276306
|
Add `|media` filter to get Media Entity for imagefields
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -15,6 +15,7 @@ use Bolt\\Entity\\User;\nuse Bolt\\Enum\\Statuses;\nuse Bolt\\Event\\Listener\\ContentFillListener;\nuse Bolt\\Repository\\ContentRepository;\n+use Bolt\\Repository\\MediaRepository;\nuse Bolt\\Repository\\RelationRepository;\nuse Bolt\\Repository\\TaxonomyRepository;\nuse Bolt\\TemplateChooser;\n@@ -45,6 +46,9 @@ class ContentEditController extends TwigAwareController implements BackendZone\n/** @var ContentRepository */\nprivate $contentRepository;\n+ /** @var MediaRepository */\n+ private $mediaRepository;\n+\n/** @var ObjectManager */\nprivate $em;\n@@ -61,6 +65,7 @@ class ContentEditController extends TwigAwareController implements BackendZone\nTaxonomyRepository $taxonomyRepository,\nRelationRepository $relationRepository,\nContentRepository $contentRepository,\n+ MediaRepository $mediaRepository,\nObjectManager $em,\nUrlGeneratorInterface $urlGenerator,\nContentFillListener $contentFillListener,\n@@ -70,6 +75,7 @@ class ContentEditController extends TwigAwareController implements BackendZone\n$this->taxonomyRepository = $taxonomyRepository;\n$this->relationRepository = $relationRepository;\n$this->contentRepository = $contentRepository;\n+ $this->mediaRepository = $mediaRepository;\n$this->em = $em;\n$this->urlGenerator = $urlGenerator;\n$this->contentFillListener = $contentFillListener;\n@@ -320,6 +326,7 @@ class ContentEditController extends TwigAwareController implements BackendZone\n$content->addField($field);\n}\n+ // If the Field is translatable, set the locale\nif ($field->getDefinition()->get('localize')) {\n$field->setLocale($locale);\n@@ -334,6 +341,11 @@ class ContentEditController extends TwigAwareController implements BackendZone\n}\n$field->setValue($value);\n+\n+ // If the Field is MediaAware, link it to an existing Media Entity\n+ if ($field instanceof Field\\MediaAware) {\n+ $field->setLinkedMedia($this->mediaRepository);\n+ }\n}\nprivate function updateTaxonomy(Content $content, string $key, $taxonomy): void\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field.php",
"new_path": "src/Entity/Field.php",
"diff": "@@ -201,6 +201,13 @@ class Field implements Translatable, FieldInterface\nreturn $value;\n}\n+ public function set($key, $value): self\n+ {\n+ $this->value[$key] = $value;\n+\n+ return $this;\n+ }\n+\npublic function setValue($value): self\n{\n$this->value = (array) $value;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/ImageField.php",
"new_path": "src/Entity/Field/ImageField.php",
"diff": "@@ -6,6 +6,7 @@ namespace Bolt\\Entity\\Field;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Entity\\FieldInterface;\n+use Bolt\\Repository\\MediaRepository;\nuse Doctrine\\ORM\\Mapping as ORM;\nuse Symfony\\Component\\Asset\\PathPackage;\nuse Symfony\\Component\\Asset\\VersionStrategy\\EmptyVersionStrategy;\n@@ -14,7 +15,7 @@ use Symfony\\Component\\HttpFoundation\\Request;\n/**\n* @ORM\\Entity\n*/\n-class ImageField extends Field implements FieldInterface\n+class ImageField extends Field implements FieldInterface, MediaAware\n{\n/** @var array */\nprivate $fieldBase = [];\n@@ -69,4 +70,19 @@ class ImageField extends Field implements FieldInterface\nreturn $filesPackage->getUrl($this->get('filename'));\n}\n+\n+ public function getLinkedMedia()\n+ {\n+ dump($this);\n+ }\n+\n+ public function setLinkedMedia(MediaRepository $mediaRepository)\n+ {\n+ $media = $mediaRepository->findOneByFullFilename($this->get('filename'));\n+\n+ if ($media) {\n+ $this->set('media', $media->getId());\n+ }\n+ }\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Entity/Field/MediaAware.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Entity\\Field;\n+\n+use Bolt\\Repository\\MediaRepository;\n+\n+/**\n+ * Field that has in excerpt must implement this interface\n+ */\n+interface MediaAware\n+{\n+ public function getLinkedMedia();\n+\n+ public function setLinkedMedia(MediaRepository $mediaRepository);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Repository/MediaRepository.php",
"new_path": "src/Repository/MediaRepository.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Repository;\nuse Bolt\\Entity\\Media;\nuse Doctrine\\Bundle\\DoctrineBundle\\Repository\\ServiceEntityRepository;\nuse Symfony\\Bridge\\Doctrine\\RegistryInterface;\n+use Webmozart\\PathUtil\\Path;\n/**\n* @method Media|null find($id, $lockMode = null, $lockVersion = null)\n@@ -49,4 +50,15 @@ class MediaRepository extends ServiceEntityRepository\n;\n}\n*/\n+\n+ public function findOneByFullFilename(string $fullFileName, string $location = 'files'): ?Media\n+ {\n+ $criteria = [\n+ 'location' => $location,\n+ 'path' => Path::getDirectory($fullFileName),\n+ 'filename' => Path::getFilename($fullFileName),\n+ ];\n+\n+ return $this->findOneBy($criteria);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ImageExtension.php",
"new_path": "src/Twig/ImageExtension.php",
"diff": "@@ -7,6 +7,8 @@ namespace Bolt\\Twig;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field\\ImageField;\n+use Bolt\\Entity\\Media;\n+use Bolt\\Repository\\MediaRepository;\nuse League\\Glide\\Urls\\UrlBuilderFactory;\nuse Symfony\\Component\\Asset\\Packages;\nuse Twig\\Extension\\AbstractExtension;\n@@ -23,11 +25,19 @@ class ImageExtension extends AbstractExtension\n/** @var Packages */\nprivate $packages;\n- public function __construct(Config $config, Packages $packages)\n+ /** @var MediaRepository */\n+ private $mediaRepository;\n+\n+ /** @var Notifications */\n+ private $notifications;\n+\n+ public function __construct(Config $config, Packages $packages, MediaRepository $mediaRepository, Notifications $notifications)\n{\n$this->config = $config;\n$this->secret = $this->config->get('general/secret');\n$this->packages = $packages;\n+ $this->mediaRepository = $mediaRepository;\n+ $this->notifications = $notifications;\n}\n/**\n@@ -35,18 +45,15 @@ class ImageExtension extends AbstractExtension\n*/\npublic function getFilters(): array\n{\n- // Note: we do _not_ include 'image' here, because it would clash with the\n- // magic \"Image\" extras.\n- return [\n- new TwigFilter('popup', [$this, 'popup'], [\n- 'is_safe' => ['html'],\n- ]),\n- new TwigFilter('showimage', [$this, 'showImage'], [\n+ $safe = [\n'is_safe' => ['html'],\n- ]),\n- new TwigFilter('thumbnail', [$this, 'thumbnail'], [\n- 'is_safe' => ['html'],\n- ]),\n+ ];\n+\n+ return [\n+ new TwigFilter('popup', [$this, 'popup'], $safe),\n+ new TwigFilter('showimage', [$this, 'showImage'], $safe),\n+ new TwigFilter('thumbnail', [$this, 'thumbnail'], $safe),\n+ new TwigFilter('media', [$this, 'media']),\n];\n}\n@@ -55,35 +62,21 @@ class ImageExtension extends AbstractExtension\n*/\npublic function getFunctions(): array\n{\n- return [\n- new TwigFunction('image', [$this, 'image'], [\n- 'is_safe' => ['html'],\n- ]),\n- new TwigFunction('popup', [$this, 'popup'], [\n- 'is_safe' => ['html'],\n- ]),\n- new TwigFunction('showimage', [$this, 'showImage'], [\n- 'is_safe' => ['html'],\n- ]),\n- new TwigFunction('thumbnail', [$this, 'thumbnail'], [\n+ $safe = [\n'is_safe' => ['html'],\n- ]),\n];\n- }\n-\n- /**\n- * @param ImageField|array|string $image\n- */\n- public function image($image): string\n- {\n- $filename = $this->getFilename($image);\n- return $this->packages->getUrl($filename, 'files');\n+ return [\n+ new TwigFunction('popup', [$this, 'popup'], $safe),\n+ new TwigFunction('showimage', [$this, 'showImage'], $safe),\n+ new TwigFunction('thumbnail', [$this, 'thumbnail'], $safe),\n+ new TwigFunction('media', [$this, 'media']),\n+ ];\n}\npublic function popup($image, int $width = 320, int $height = 240): string\n{\n- $link = $this->image($image);\n+ $link = $this->getFilename($image);\n$thumbnail = $this->thumbnail($image, $width, $height);\n$alt = $this->getAlt($image);\n@@ -95,7 +88,7 @@ class ImageExtension extends AbstractExtension\n*/\npublic function showImage($image, ?int $width = null, ?int $height = null): string\n{\n- $link = $this->image($image);\n+ $link = $this->getFilename($image);\n$alt = $this->getAlt($image);\nif ($width) {\n@@ -141,6 +134,27 @@ class ImageExtension extends AbstractExtension\nreturn $urlBuilder->getUrl($filename, $params);\n}\n+ /**\n+ * @param ImageField|array|string $image\n+ */\n+ public function media($image): ?Media\n+ {\n+ if (is_array($image) && array_key_exists('media', $image)) {\n+ $id = $image['media'];\n+ } elseif ($image instanceof ImageField) {\n+ $id = $image->get('media');\n+ } else {\n+ return $this->notifications->warning(\n+ 'Incorrect usage of `media`-filter',\n+ 'The `media`-filter can only be applied to an `ImageField`, or an array that has a key named `media` which holds an id.'\n+ );\n+ }\n+\n+ $media = $this->mediaRepository->findOneBy(['id' => $id]);\n+\n+ return $media;\n+ }\n+\n/**\n* @param ImageField|Content|array|string $image\n*/\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add `|media` filter to get Media Entity for imagefields
|
95,144 |
17.11.2019 14:29:16
| -3,600 |
7ae34bf1e0aebc5818210686e12b4b3662ff226c
|
Update weird-ass phpspec test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/spec/Bolt/Twig/ContentExtensionSpec.php",
"new_path": "tests/spec/Bolt/Twig/ContentExtensionSpec.php",
"diff": "@@ -75,13 +75,12 @@ class ContentExtensionSpec extends ObjectBehavior\npublic function it_gets_image(Content $content, ImageField $field, Field $otherField): void\n{\n- $field->getValue()->shouldBeCalled()->willReturn(['path' => self::TEST_IMAGE]);\n$content->getFields()->shouldBeCalled()->willReturn(new ArrayCollection([\n$otherField->getWrappedObject(),\n$field->getWrappedObject(),\n]));\n- $this->getImage($content)->shouldBe(['path' => self::TEST_IMAGE]);\n+ $this->getImage($content)->shouldBe($field);\n}\npublic function it_gets_image_path(Content $content, ImageField $field, Field $otherField): void\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update weird-ass phpspec test
|
95,144 |
17.11.2019 15:22:56
| -3,600 |
02b2e6b00e927888b575c56424f85ace76b9cbfa
|
Move test.twig
|
[
{
"change_type": "RENAME",
"old_path": "public/theme/skeleton/test.twig",
"new_path": "public/theme/skeleton/custom/test.twig",
"diff": "-{% extends 'partials/_master.twig' %}\n+{% extends '../partials/_master.twig' %}\n{% block main %}\n<hr>\n- {% include 'partials/_recordfooter.twig' with { 'record': record, 'extended': true } %}\n+ {% include '../partials/_recordfooter.twig' with { 'record': record, 'extended': true } %}\n{% endblock main %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Move test.twig
|
95,144 |
17.11.2019 16:50:28
| -3,600 |
aded5d39ec3ea35913a17f7101fd26886cec711b
|
Working on Maintenance Mode
|
[
{
"change_type": "MODIFY",
"old_path": "config/bolt/config.yaml",
"new_path": "config/bolt/config.yaml",
"diff": "@@ -32,20 +32,10 @@ locale: en\n# Set maintenance mode on or off.\n#\n-# While in maintenance mode, only users of level editor or higher can access the\n-# site.\n-#\n-# All other visitors are presented with a notice that the site is currently\n-# offline.\n-#\n-# The default template file can be found in /app/theme_defaults/ and overridden\n-# with this option using your own theme.\n-#\n-# Note: If you've changed the filename, and your changes do not show up on the\n-# website, be sure to check for a config.yaml file in your themes folder.\n-# If a template is set there, it will override the setting here.\n+# The default for the Maintenance mode (503) page. Can be an (array of) template\n+# names or identifiers for records, which will be tried until a match is found.\nmaintenance_mode: false\n-maintenance_template: maintenance_default.twig\n+maintenance: [ blocks/503-maintenance-mode, 'helpers/page_503.html.twig' ]\n# The hour of the day for the internal cron task scheduler to run daily, weekly,\n# monthly and yearly jobs.\n@@ -82,8 +72,6 @@ homepage_template: index.twig\n# The default content for the 404 page. Can be an (array of) template names or\n# identifiers for records, which will be tried until a match is found.\n-#\n-# Note: The record specified in this parameter must be set to published.\nnotfound: [ blocks/404-not-found, 'helpers/page_404.html.twig' ]\n# The default template and amount of records to use for listing-pages on the\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/ExceptionController.php",
"new_path": "src/Controller/ExceptionController.php",
"diff": "@@ -44,17 +44,22 @@ class ExceptionController extends SymfonyExceptionController\n{\n$code = $exception->getStatusCode();\n- if ($code === 404) {\n+ if ($code === Response::HTTP_NOT_FOUND) {\n$this->twig->addGlobal('exception', $exception);\nreturn $this->showNotFound();\n}\n+ if ($code === Response::HTTP_SERVICE_UNAVAILABLE) {\n+ $this->twig->addGlobal('exception', $exception);\n+\n+ return $this->showMaintenance();\n+ }\n+\n// If not a 404, we'll let Symfony handle it as usual.\nreturn parent::showAction($request, $exception, $logger);\n}\n- private function showNotFound()\n{\nforeach ($this->config->get('general/notfound') as $item) {\n$output = $this->attemptToRender($item);\n@@ -64,7 +69,20 @@ class ExceptionController extends SymfonyExceptionController\n}\n}\n- return new Response('Oh no');\n+ return new Response('404: Not found (and there was no proper page configured to display)');\n+ }\n+\n+ private function showMaintenance(): Response\n+ {\n+ foreach ($this->config->get('general/maintenance') as $item) {\n+ $output = $this->attemptToRender($item);\n+\n+ if ($output instanceof Response) {\n+ return $output;\n+ }\n+ }\n+\n+ return new Response('503: Maintenance mode (and there was no proper page configured to display)');\n}\nprivate function attemptToRender(string $item): ?Response\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -215,6 +215,11 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n'slug' => '404-not-found',\n'status' => Statuses::HELD,\n];\n+ $records['blocks'][] = [\n+ 'title' => '503 Service Unavailable (Maintenance Mode)',\n+ 'slug' => '503-maintenance mode',\n+ 'status' => Statuses::HELD,\n+ ];\n$records['tests'][] = [\n'selectfield' => 'bar',\n'multiselect' => 'Michelangelo',\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Event/Subscriber/MaintenanceModeSubscriber.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Event\\Subscriber;\n+\n+use Bolt\\Configuration\\Config;\n+use Bolt\\Controller\\Frontend\\FrontendZone;\n+use Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n+use Symfony\\Component\\HttpKernel\\Event\\ControllerEvent;\n+use Symfony\\Component\\HttpKernel\\Exception\\HttpException;\n+use Symfony\\Component\\HttpKernel\\KernelEvents;\n+\n+class MaintenanceModeSubscriber implements EventSubscriberInterface\n+{\n+ /** @var Config */\n+ private $config;\n+\n+ public function __construct(Config $config)\n+ {\n+ $this->config = $config;\n+ }\n+ public function onKernelController(ControllerEvent $event): void\n+ {\n+ $controller = $event->getController();\n+\n+ // when a controller class defines multiple action methods, the\n+ // controller is returned as [$controllerInstance, 'methodName']\n+ if (is_array($controller)) {\n+ $controller = $controller[0];\n+ }\n+\n+ if ($controller instanceof FrontendZone && $this->config->get('general/maintenance_mode', 'false')) {\n+ throw new HttpException(503, 'Service Unavailable (Maintenance Mode)');\n+ }\n+ }\n+\n+ public static function getSubscribedEvents()\n+ {\n+ return [\n+ KernelEvents::CONTROLLER => 'onKernelController',\n+ ];\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/helpers/page_503.html.twig",
"diff": "+<!DOCTYPE html>\n+<html lang=\"en\">\n+<head>\n+ <meta charset=\"utf-8\">\n+ <title>{{ exception.statusCode }} :: {{ exception.class|split('\\\\')|last }}</title>\n+ <link rel=\"stylesheet\" href=\"https://unpkg.com/purecss@1.0.1/build/pure-min.css\" integrity=\"sha384-oAOxQR6DkCoMliIh8yFnu25d7Eq/PHS21PClpwjOTeU2jRSq11vu66rf90/cZr47\" crossorigin=\"anonymous\">\n+</head>\n+\n+<body id=\"home\">\n+\n+<div style=\"padding: 2rem 4rem;\">\n+\n+<h1>{{ exception.statusCode }} :: {{ exception.class|split('\\\\')|last }}</h1>\n+\n+<p>{{ exception.message }}</p>\n+\n+ {# will only be shown if debug is on. #}\n+ {{ dump(exception) }}\n+\n+</div>\n+</body>\n+</html>\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on Maintenance Mode
|
95,144 |
17.11.2019 17:06:54
| -3,600 |
d2d985f241c6c1d99a6940b1cf6c524a80b225bc
|
Fixing pagers
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/custom/setcontent_1.twig",
"new_path": "public/theme/skeleton/custom/setcontent_1.twig",
"diff": "</section>\n{# If there are more records than will fit on one page, the pager is shown.#}\n- {{ pager(entries, template = 'partials/_sub_pager.twig') }}\n+ {{ pager(entries, template = 'helpers/_pager_basic.html.twig') }}\n<section id=\"two\">\n<h1>Two</h1>\n{# If there are more records than will fit on one page, the pager is shown.#}\n- {{ pager(pages, template = 'partials/_sub_pager.twig') }}\n+ {{ pager(pages, template = 'helpers/_pager_basic.html.twig') }}\n<section id=\"three\">\n<h1>Three</h1>\n"
},
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/search.twig",
"new_path": "public/theme/skeleton/search.twig",
"diff": "{% endfor %}\n{# If there are more records than will fit on one page, the pager is shown. #}\n- {{ pager(records, template = 'helpers/_pager_bulma.html.twig') }}\n+ {{ pager(records, template = 'helpers/_pager_basic.html.twig') }}\n{% endblock main %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fixing pagers
|
95,144 |
18.11.2019 20:24:09
| -3,600 |
f6b0563e7f589b82480e1697dd187cf9991d5e6b
|
Make 'extras' only return values for Image, not the entire ImageField object
|
[
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentExtension.php",
"new_path": "src/Twig/ContentExtension.php",
"diff": "@@ -125,13 +125,13 @@ class ContentExtension extends AbstractExtension\n}\n/**\n- * @return ImageField|string|null\n+ * @return ImageField|array|null\n*/\n- public function getImage(Content $content, bool $onlyPath = false)\n+ public function getImage(Content $content, bool $onlyValues = true)\n{\nforeach ($content->getFields() as $field) {\nif ($field instanceof ImageField) {\n- return $onlyPath ? $field->getPath() : $field;\n+ return $onlyValues ? $field->getValue() : $field;\n}\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make 'extras' only return values for Image, not the entire ImageField object
|
95,144 |
18.11.2019 20:38:31
| -3,600 |
cb0411f111e86feb187dc0f52ca0fe09fc6ae80b
|
Fix Weird-ass ContentExtensionSpec test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/spec/Bolt/Twig/ContentExtensionSpec.php",
"new_path": "tests/spec/Bolt/Twig/ContentExtensionSpec.php",
"diff": "@@ -24,7 +24,7 @@ use Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nclass ContentExtensionSpec extends ObjectBehavior\n{\npublic const TEST_TITLE = 'test title';\n- public const TEST_IMAGE = 'kitten.jpg';\n+ public const TEST_IMAGE = [];\npublic const TEST_EXCERPT = 'test excerpt';\npublic const TEST_LINK = 'test/link';\npublic const TEST_FULL_LINK = 'http://localhost/test/link';\n@@ -80,18 +80,18 @@ class ContentExtensionSpec extends ObjectBehavior\n$field->getWrappedObject(),\n]));\n- $this->getImage($content)->shouldBe($field);\n+ $this->getImage($content, false)->shouldBe($field);\n}\npublic function it_gets_image_path(Content $content, ImageField $field, Field $otherField): void\n{\n- $field->getPath()->shouldBeCalled()->willReturn(self::TEST_IMAGE);\n+ $field->getValue()->shouldBeCalled()->willReturn(self::TEST_IMAGE);\n$content->getFields()->shouldBeCalled()->willReturn(new ArrayCollection([\n$otherField->getWrappedObject(),\n$field->getWrappedObject(),\n]));\n- $this->getImage($content, true)->shouldBe(self::TEST_IMAGE);\n+ $this->getImage($content)->shouldBe(self::TEST_IMAGE);\n}\npublic function it_gets_excerpt(Content $content, Excerptable $field, TextField $titleField, Field $otherField, ContentType $definition): void\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fix Weird-ass ContentExtensionSpec test
|
95,144 |
19.11.2019 17:37:58
| -3,600 |
5ec74bf352cdcda8570a5fef7392a844e1f84fd9
|
Update Composer.json (Doctrine/ORM 2.7)
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"bolt/common\": \"^2.1.0\",\n\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n- \"doctrine/annotations\": \"^1.7\",\n- \"doctrine/dbal\": \"^2.10.0\",\n\"doctrine/doctrine-bundle\": \"^1.11\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n- \"doctrine/orm\": \"^2.6\",\n+ \"doctrine/orm\": \"^2.7\",\n\"drupol/composer-packages\": \"^1.0\",\n\"embed/embed\": \"^3.4\",\n\"erusev/parsedown\": \"^1.7\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update Composer.json (Doctrine/ORM 2.7)
|
95,144 |
19.11.2019 20:03:48
| -3,600 |
5989a4611703e3608bf2d0adaf10d9395633f140
|
Update a few Dutch Language strings
|
[
{
"change_type": "MODIFY",
"old_path": "translations/messages.nl.xlf",
"new_path": "translations/messages.nl.xlf",
"diff": "<target>Opties</target>\n</segment>\n</unit>\n+ <unit id=\"_KyvT9o\" name=\"general.phrase.no-search-term-provided\">\n+ <segment>\n+ <source>general.phrase.no-search-term-provided</source>\n+ <target>Geef een zoekterm op om relevante resultaten te tonen.</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"2CfJ3WY\" name=\"general.phrase.search-results-for\">\n+ <segment>\n+ <source>general.phrase.search-results-for</source>\n+ <target>Zoekresultaten voor %search%.</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"V0VhH5g\" name=\"general.phrase.no-search-results-for\">\n+ <segment>\n+ <source>general.phrase.no-search-results-for</source>\n+ <target>Geen zoekresultaten voor '%search%'.</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update a few Dutch Language strings
|
95,144 |
19.11.2019 20:05:15
| -3,600 |
7aed30874b79e00641a99d7af661da3f3d28489a
|
Implement `__call` magic method on Field, so we can do `record|image.alt`
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field.php",
"new_path": "src/Entity/Field.php",
"diff": "@@ -95,6 +95,17 @@ class Field implements Translatable, FieldInterface\nreturn implode(', ', $value);\n}\n+ public function __call(string $key = '', array $arguments = [])\n+ {\n+ $value = $this->getValue();\n+\n+ if (is_array($value) && array_key_exists($key, $value)) {\n+ return $value[$key];\n+ }\n+\n+ return null;\n+ }\n+\npublic static function factory(LaravelCollection $definition, string $name = ''): self\n{\n$type = $definition['type'];\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Implement `__call` magic method on Field, so we can do `record|image.alt`
|
95,144 |
21.11.2019 19:05:32
| -3,600 |
77e81786b674a168d87e7ce3872ebdcc3decf727
|
Updating composer dependencies (Symfony 4.4)
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"sensio/framework-extra-bundle\": \"^5.4\",\n\"sensiolabs/security-checker\": \"^5.0\",\n\"siriusphp/upload\": \"^2.1\",\n- \"symfony/asset\": \"^4.3\",\n- \"symfony/console\": \"^4.3\",\n- \"symfony/dependency-injection\": \"^4.3\",\n- \"symfony/expression-language\": \"^4.3\",\n+ \"symfony/asset\": \"^4.4\",\n+ \"symfony/console\": \"^4.4\",\n+ \"symfony/dependency-injection\": \"^4.4\",\n+ \"symfony/expression-language\": \"^4.4\",\n\"symfony/flex\": \"^1.4\",\n- \"symfony/form\": \"^4.3\",\n- \"symfony/framework-bundle\": \"^4.3\",\n- \"symfony/http-client\": \"^4.3\",\n- \"symfony/monolog-bridge\": \"^4.3\",\n+ \"symfony/form\": \"^4.4\",\n+ \"symfony/framework-bundle\": \"^4.4\",\n+ \"symfony/http-client\": \"^4.4\",\n+ \"symfony/monolog-bridge\": \"^4.4\",\n\"symfony/monolog-bundle\": \"^3.4\",\n\"symfony/polyfill-php72\": \"^1.12\",\n- \"symfony/security-bundle\": \"^4.3\",\n- \"symfony/serializer\": \"^4.3\",\n+ \"symfony/security-bundle\": \"^4.4\",\n+ \"symfony/serializer\": \"^4.4\",\n\"symfony/swiftmailer-bundle\": \"^3.2\",\n- \"symfony/translation\": \"^4.3\",\n- \"symfony/twig-bundle\": \"^4.3\",\n- \"symfony/validator\": \"^4.3\",\n- \"symfony/var-dumper\": \"^4.3\",\n+ \"symfony/translation\": \"^4.4\",\n+ \"symfony/twig-bundle\": \"^4.4\",\n+ \"symfony/validator\": \"^4.4\",\n+ \"symfony/var-dumper\": \"^4.4\",\n\"symfony/webpack-encore-bundle\": \"^1.6\",\n- \"symfony/yaml\": \"^4.3\",\n+ \"symfony/yaml\": \"^4.4\",\n\"tightenco/collect\": \"^6.0\",\n\"twig/extensions\": \"^1.5\",\n\"ua-parser/uap-php\": \"^3.9\",\n\"phpstan/phpstan-symfony\": \"^0.11\",\n\"phpunit/phpunit\": \"^7.5\",\n\"roave/security-advisories\": \"dev-master@dev\",\n- \"symfony/browser-kit\": \"^4.3\",\n- \"symfony/css-selector\": \"^4.3\",\n- \"symfony/debug-bundle\": \"^4.3\",\n- \"symfony/dotenv\": \"^4.3\",\n+ \"symfony/browser-kit\": \"^4.4\",\n+ \"symfony/css-selector\": \"^4.4\",\n+ \"symfony/debug-bundle\": \"^4.4\",\n+ \"symfony/dotenv\": \"^4.4\",\n\"symfony/maker-bundle\": \"^1.13\",\n- \"symfony/stopwatch\": \"^4.3\",\n- \"symfony/web-profiler-bundle\": \"^4.3\",\n- \"symfony/web-server-bundle\": \"^4.3\",\n+ \"symfony/stopwatch\": \"^4.4\",\n+ \"symfony/web-profiler-bundle\": \"^4.4\",\n+ \"symfony/web-server-bundle\": \"^4.4\",\n\"symplify/easy-coding-standard\": \"^6.1.0\"\n},\n\"config\": {\n\"extra\": {\n\"symfony\": {\n\"allow-contrib\": true,\n- \"require\": \"^4.3\"\n+ \"require\": \"^4.4\"\n}\n},\n\"autoload\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"symfony/dotenv\": {\n\"version\": \"v3.4.0-beta2\"\n},\n+ \"symfony/error-handler\": {\n+ \"version\": \"v4.4.0\"\n+ },\n\"symfony/event-dispatcher\": {\n\"version\": \"v3.4.0-beta2\"\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating composer dependencies (Symfony 4.4)
|
95,144 |
22.11.2019 07:23:58
| -3,600 |
3151749049f9b3d647a819ca6d8fe6b670bc41d6
|
Don't mention "Package container-interop/container-interop is abandoned"
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"periodical-tasks\": [\n\"security-checker security:check\"\n]\n+ },\n+ \"replace\": {\n+ \"container-interop/container-interop\": \"*\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"composer/xdebug-handler\": {\n\"version\": \"1.1.0\"\n},\n- \"container-interop/container-interop\": {\n- \"version\": \"1.2.0\"\n- },\n\"dama/doctrine-test-bundle\": {\n\"version\": \"4.0\",\n\"recipe\": {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Don't mention "Package container-interop/container-interop is abandoned"
|
95,185 |
22.11.2019 20:23:45
| -28,800 |
4b2bc17efc696615941b3c3852c200c7974053c1
|
Makefile: fixup composer Memory limit errors
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "DC_RUN ?= docker-compose run --rm\n+COMPOSER ?= COMPOSER_MEMORY_LIMIT=-1 composer\n+\n.PHONY: help install server server-stop cache csclear cscheck csfix csfix-tests stancheck test \\\nbehat full-test db-create db-update db-reset docker-install docker-install-deps docker-start docker-assets-serve \\\ndocker-update docker-cache docker-csclear docker-cscheck docker-csfix docker-stancheck docker-db-create docker-db-reset \\\n@@ -18,12 +20,12 @@ start: ## to run the install scripts and start the server\ninstall: ## to install all project dependencies (Composer and NPM)\ncp -n .env.dist .env || true\n- composer install\n+ $(COMPOSER) install\nnpm install\nnpm run build\nupdate:\n- composer update && composer outdated\n+ $(COMPOSER) update && $(COMPOSER) outdated\nserver: ## to start server\nbin/console server:start 127.0.0.1:8088 -q || true\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Makefile: fixup composer Memory limit errors
|
95,144 |
23.11.2019 13:38:50
| -3,600 |
836c4ee57c28bf29551f93163e9ef7061e27fe28
|
Updating composer deps, prepare for SF 5 update
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"ext-mbstring\": \"*\",\n\"ext-pdo\": \"*\",\n\"antishov/doctrine-extensions-bundle\": \"^1.4\",\n- \"api-platform/core\": \"^2.4\",\n+ \"api-platform/core\": \"^2.5\",\n\"bolt/common\": \"^2.1.0\",\n\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n- \"doctrine/doctrine-bundle\": \"^1.11\",\n+ \"doctrine/doctrine-bundle\": \"^1.12\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n\"doctrine/orm\": \"^2.7\",\n\"drupol/composer-packages\": \"^1.0\",\n\"embed/embed\": \"^3.4\",\n\"erusev/parsedown\": \"^1.7\",\n- \"ezyang/htmlpurifier\": \"^4.11\",\n- \"fzaninotto/faker\": \"^1.8\",\n+ \"ezyang/htmlpurifier\": \"^4.12\",\n+ \"fzaninotto/faker\": \"^1.9\",\n\"gedmo/doctrine-extensions\": \"v2.4.x-dev\",\n- \"knplabs/knp-menu-bundle\": \"^2.2\",\n+ \"knplabs/knp-menu-bundle\": \"^2.3\",\n\"league/glide-symfony\": \"^1.0\",\n\"miljar/php-exif\": \"^0.6.4\",\n- \"nelmio/cors-bundle\": \"^1.5\",\n- \"nesbot/carbon\": \"^1.38 || ^2.24\",\n- \"peterkahl/country-code-to-emoji-flag\": \"^0.9.1\",\n+ \"nelmio/cors-bundle\": \"^2.0\",\n+ \"nesbot/carbon\": \"^2.27\",\n+ \"peterkahl/country-code-to-emoji-flag\": \"^1.2\",\n\"php-translation/symfony-bundle\": \"^0.9\",\n\"phpdocumentor/reflection-docblock\": \"^4.3\",\n\"psr/simple-cache\": \"^1.0\",\n\"scienta/doctrine-json-functions\": \"^4.0\",\n- \"sensio/framework-extra-bundle\": \"^5.4\",\n- \"sensiolabs/security-checker\": \"^5.0\",\n+ \"sensio/framework-extra-bundle\": \"^5.5\",\n+ \"sensiolabs/security-checker\": \"^6.0\",\n\"siriusphp/upload\": \"^2.1\",\n\"symfony/asset\": \"^4.4\",\n\"symfony/console\": \"^4.4\",\n\"symfony/framework-bundle\": \"^4.4\",\n\"symfony/http-client\": \"^4.4\",\n\"symfony/monolog-bridge\": \"^4.4\",\n- \"symfony/monolog-bundle\": \"^3.4\",\n+ \"symfony/monolog-bundle\": \"^3.5\",\n\"symfony/polyfill-php72\": \"^1.12\",\n\"symfony/security-bundle\": \"^4.4\",\n\"symfony/serializer\": \"^4.4\",\n- \"symfony/swiftmailer-bundle\": \"^3.2\",\n+ \"symfony/swiftmailer-bundle\": \"^3.4\",\n\"symfony/translation\": \"^4.4\",\n\"symfony/twig-bundle\": \"^4.4\",\n\"symfony/validator\": \"^4.4\",\n\"symfony/var-dumper\": \"^4.4\",\n- \"symfony/webpack-encore-bundle\": \"^1.6\",\n+ \"symfony/webpack-encore-bundle\": \"^1.7\",\n\"symfony/yaml\": \"^4.4\",\n\"tightenco/collect\": \"^6.0\",\n\"twig/extensions\": \"^1.5\",\n\"ua-parser/uap-php\": \"^3.9\",\n\"webmozart/path-util\": \"^2.3\",\n\"webonyx/graphql-php\": \"^0.13\",\n- \"white-october/pagerfanta-bundle\": \"^1.2\"\n+ \"white-october/pagerfanta-bundle\": \"^1.3\"\n},\n\"conflict\": {\n\"symfony/symfony\": \"*\"\n\"bolt/newswidget\": \"^1.0\",\n\"coduo/php-matcher\": \"^3.2\",\n\"dama/doctrine-test-bundle\": \"^6.2.0\",\n- \"doctrine/doctrine-fixtures-bundle\": \"^3.2\",\n+ \"doctrine/doctrine-fixtures-bundle\": \"^3.3\",\n\"lakion/mink-debug-extension\": \"^1.2\",\n\"php-http/httplug-pack\": \"^1.2\",\n\"php-translation/loco-adapter\": \"^0.8\",\n\"phpspec/phpspec\": \"^5.1\",\n- \"phpspec/prophecy\": \"^1.8\",\n+ \"phpspec/prophecy\": \"^1.9\",\n\"phpstan/phpstan\": \"^0.11\",\n\"phpstan/phpstan-doctrine\": \"^0.11\",\n\"phpstan/phpstan-symfony\": \"^0.11\",\n\"symfony/css-selector\": \"^4.4\",\n\"symfony/debug-bundle\": \"^4.4\",\n\"symfony/dotenv\": \"^4.4\",\n- \"symfony/maker-bundle\": \"^1.13\",\n+ \"symfony/maker-bundle\": \"^1.14\",\n\"symfony/stopwatch\": \"^4.4\",\n\"symfony/web-profiler-bundle\": \"^4.4\",\n\"symfony/web-server-bundle\": \"^4.4\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating composer deps, prepare for SF 5 update
|
95,144 |
23.11.2019 17:08:36
| -3,600 |
19e9d0fea6f636a40e955f866f38489bd2c2a364
|
Add functionality for Extensions to add their own Routes
|
[
{
"change_type": "MODIFY",
"old_path": "config/routes/bolt.yaml",
"new_path": "config/routes/bolt.yaml",
"diff": "@@ -18,3 +18,8 @@ control_panel_async:\ncontrollers:\nresource: '../src/Controller/ImageController.php'\ntype: annotation\n+\n+# Routes added by Extensions get added here, by Bolt\\Extension\\RoutesLoader\n+extensions:\n+ resource: .\n+ type: bolt_extensions\n"
},
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -79,3 +79,5 @@ services:\narguments:\n$debug: '%kernel.debug%'\n+ Bolt\\Extension\\RoutesLoader:\n+ tags: [routing.loader]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Extension/BaseExtension.php",
"new_path": "src/Extension/BaseExtension.php",
"diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\nuse Bolt\\Configuration\\Config;\n+use Bolt\\Controller\\Frontend\\TemplateController;\nuse Bolt\\Event\\Subscriber\\ExtensionSubscriber;\nuse Bolt\\Widget\\WidgetInterface;\nuse Bolt\\Widgets;\n@@ -17,6 +18,8 @@ use Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Symfony\\Component\\Filesystem\\Filesystem;\nuse Symfony\\Component\\HttpFoundation\\Session\\Session;\n+use Symfony\\Component\\Routing\\Route;\n+use Symfony\\Component\\Routing\\RouteCollection;\nuse Symfony\\Component\\Stopwatch\\Stopwatch;\nuse Symfony\\Component\\Yaml\\Parser;\nuse Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface;\n@@ -24,6 +27,7 @@ use Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Environment;\nuse Twig\\Extension\\ExtensionInterface as TwigExtensionInterface;\n+\n/**\n* BaseWidget can be used as easy starter pack or as a base for your own extensions.\n*/\n@@ -151,7 +155,7 @@ abstract class BaseExtension implements ExtensionInterface\n/**\n* Shortcut method to register a widget and inject the extension into it\n*/\n- public function registerWidget(WidgetInterface $widget): void\n+ public function addWidget(WidgetInterface $widget): void\n{\n$widget->injectExtension($this);\n@@ -165,7 +169,7 @@ abstract class BaseExtension implements ExtensionInterface\n/**\n* Shortcut method to register a TwigExtension.\n*/\n- public function registerTwigExtension(TwigExtensionInterface $extension): void\n+ public function addTwigExtension(TwigExtensionInterface $extension): void\n{\nif ($this->getTwig()->hasExtension(\\get_class($extension))) {\nreturn;\n@@ -174,7 +178,7 @@ abstract class BaseExtension implements ExtensionInterface\n$this->getTwig()->addExtension($extension);\n}\n- public function registerListener($event, $callback): void\n+ public function addListener($event, $callback): void\n{\n/** @var EventDispatcher $dp */\n$dp = $this->eventDispatcher;\n@@ -182,6 +186,31 @@ abstract class BaseExtension implements ExtensionInterface\n$dp->addListener($event, $callback);\n}\n+ /**\n+ * @deprecated\n+ */\n+ public function registerWidget(WidgetInterface $widget): void\n+ {\n+ $this->addWidget($widget);\n+ }\n+\n+ /**\n+ * @deprecated\n+ */\n+ public function registerTwigExtension(TwigExtensionInterface $extension): void\n+ {\n+ $this->addTwigExtension($extension);\n+ }\n+\n+ /**\n+ * @deprecated\n+ */\n+ public function registerListener($event, $callback): void\n+ {\n+ $this->addListener($event, $callback);\n+ }\n+\n+\n/**\n* Get the ComposerPackage, that contains information about the package,\n* version, etc.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Extension/ExtensionRegistry.php",
"new_path": "src/Extension/ExtensionRegistry.php",
"diff": "@@ -96,4 +96,31 @@ class ExtensionRegistry\n$this->extensions[$extensionClass] = $extension;\n}\n}\n+\n+ /**\n+ * This method calls the `getRoutes()` method for all registered extension,\n+ * and compiles an array of routes. This is used in\n+ * Bolt\\Extension\\RoutesLoader::load() to add all these routes to the\n+ * (cached) routing.\n+ * The reason why we're not iterating over `$this->extensions` is that when\n+ * this method is called, they are not instantiated yet.\n+ */\n+ public function getAllRoutes(): array\n+ {\n+ $routes = [];\n+\n+ $this->addComposerPackages();\n+\n+ foreach ($this->getExtensionClasses() as $extensionClass) {\n+ $extension = new $extensionClass();\n+\n+ if (method_exists($extension, 'getRoutes')) {\n+ $extRoutes = $extension->getRoutes();\n+ $routes = array_merge($routes, $extRoutes);\n+ }\n+ }\n+\n+ return $routes;\n+ }\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Extension/RoutesLoader.php",
"diff": "+<?php\n+\n+namespace Bolt\\Extension;\n+\n+use Symfony\\Component\\Config\\Loader\\Loader;\n+use Symfony\\Component\\Routing\\Route;\n+use Symfony\\Component\\Routing\\RouteCollection;\n+\n+class RoutesLoader extends Loader\n+{\n+\n+ /** @var ExtensionRegistry */\n+ private $registry;\n+\n+ public function __construct(ExtensionRegistry $registry)\n+ {\n+ $this->registry = $registry;\n+ }\n+\n+ public function load($resource, $type = null)\n+ {\n+ $routeCollection = new RouteCollection();\n+\n+ foreach ($this->registry->getAllRoutes() as $name => $route) {\n+ $routeCollection->add($name, $route);\n+ }\n+\n+ return $routeCollection;\n+ }\n+\n+ public function supports($resource, $type = null)\n+ {\n+ return $type === 'bolt_extensions';\n+ }\n+}\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add functionality for Extensions to add their own Routes
|
95,144 |
23.11.2019 18:07:03
| -3,600 |
e85b50723b6c38e0177d988666205106b654f17b
|
add `addTwigNamespace` method
|
[
{
"change_type": "MODIFY",
"old_path": "src/Extension/BaseExtension.php",
"new_path": "src/Extension/BaseExtension.php",
"diff": "@@ -5,7 +5,6 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\nuse Bolt\\Configuration\\Config;\n-use Bolt\\Controller\\Frontend\\TemplateController;\nuse Bolt\\Event\\Subscriber\\ExtensionSubscriber;\nuse Bolt\\Widget\\WidgetInterface;\nuse Bolt\\Widgets;\n@@ -14,19 +13,18 @@ use Composer\\Package\\CompletePackage;\nuse Composer\\Package\\PackageInterface;\nuse ComposerPackages\\Packages;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n+use Symfony\\Bundle\\TwigBundle\\Loader\\NativeFilesystemLoader;\nuse Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Symfony\\Component\\Filesystem\\Filesystem;\nuse Symfony\\Component\\HttpFoundation\\Session\\Session;\n-use Symfony\\Component\\Routing\\Route;\n-use Symfony\\Component\\Routing\\RouteCollection;\nuse Symfony\\Component\\Stopwatch\\Stopwatch;\nuse Symfony\\Component\\Yaml\\Parser;\nuse Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Environment;\nuse Twig\\Extension\\ExtensionInterface as TwigExtensionInterface;\n-\n+use Twig\\Loader\\FilesystemLoader;\n/**\n* BaseWidget can be used as easy starter pack or as a base for your own extensions.\n@@ -45,6 +43,9 @@ abstract class BaseExtension implements ExtensionInterface\n/** @var ContainerInterface */\nprivate $container;\n+ /** @var string */\n+ private $slug;\n+\n/**\n* Returns the descriptive name of the Extension\n*/\n@@ -53,6 +54,18 @@ abstract class BaseExtension implements ExtensionInterface\nreturn 'BaseExtension';\n}\n+ /**\n+ * Returns the slugified name of the Extension\n+ */\n+ public function getSlug(): string\n+ {\n+ if ($this->slug === null) {\n+ $this->slug = Slugify::create()->slugify($this->getName());\n+ }\n+\n+ return $this->slug;\n+ }\n+\n/**\n* Returns the classname of the Extension\n*/\n@@ -178,6 +191,48 @@ abstract class BaseExtension implements ExtensionInterface\n$this->getTwig()->addExtension($extension);\n}\n+ /**\n+ * Shortcut method to add a namespace to the current Twig Environment.\n+ */\n+ public function addTwigNamespace(string $namespace = '', string $foldername = ''): void\n+ {\n+ if (empty($namespace)) {\n+ $namespace = $this->getSlug();\n+ }\n+\n+ if (empty($foldername)) {\n+ $foldername = $this->getTemplateFolder();\n+ }\n+\n+ if (! realpath($foldername)) {\n+ return;\n+ }\n+\n+ /** @var NativeFilesystemLoader $twigLoaders */\n+ $twigLoaders = $this->getTwig()->getLoader();\n+\n+ if ($twigLoaders instanceof FilesystemLoader) {\n+ $twigLoaders->prependPath($foldername, $namespace);\n+ }\n+ }\n+\n+ private function getTemplateFolder(): ?string\n+ {\n+ $reflection = new \\ReflectionClass($this);\n+\n+ $folder = dirname($reflection->getFilename()) . DIRECTORY_SEPARATOR . 'templates';\n+ if (realpath($folder)) {\n+ return realpath($folder);\n+ }\n+\n+ $folder = dirname(dirname($reflection->getFilename())) . DIRECTORY_SEPARATOR . 'templates';\n+ if (realpath($folder)) {\n+ return realpath($folder);\n+ }\n+\n+ return null;\n+ }\n+\npublic function addListener($event, $callback): void\n{\n/** @var EventDispatcher $dp */\n@@ -210,7 +265,6 @@ abstract class BaseExtension implements ExtensionInterface\n$this->addListener($event, $callback);\n}\n-\n/**\n* Get the ComposerPackage, that contains information about the package,\n* version, etc.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Extension/ExtensionRegistry.php",
"new_path": "src/Extension/ExtensionRegistry.php",
"diff": "@@ -122,5 +122,4 @@ class ExtensionRegistry\nreturn $routes;\n}\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Extension/RoutesLoader.php",
"new_path": "src/Extension/RoutesLoader.php",
"diff": "<?php\n+declare(strict_types=1);\n+\nnamespace Bolt\\Extension;\nuse Symfony\\Component\\Config\\Loader\\Loader;\n-use Symfony\\Component\\Routing\\Route;\nuse Symfony\\Component\\Routing\\RouteCollection;\nclass RoutesLoader extends Loader\n{\n-\n/** @var ExtensionRegistry */\nprivate $registry;\n@@ -17,7 +17,7 @@ class RoutesLoader extends Loader\n$this->registry = $registry;\n}\n- public function load($resource, $type = null)\n+ public function load($resource, $type = null): RouteCollection\n{\n$routeCollection = new RouteCollection();\n@@ -28,7 +28,7 @@ class RoutesLoader extends Loader\nreturn $routeCollection;\n}\n- public function supports($resource, $type = null)\n+ public function supports($resource, $type = null): bool\n{\nreturn $type === 'bolt_extensions';\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
add `addTwigNamespace` method
|
95,144 |
24.11.2019 10:20:17
| -3,600 |
0d1cb7f7c63b33d690878c29d467d541791b1ca3
|
Make sure contenttypes _always_ have a group
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -181,9 +181,8 @@ class ContentTypesParser extends BaseParser\n*/\nprotected function parseFieldsAndGroups(array $fields): array\n{\n- $currentGroup = 'ungrouped';\n+ $currentGroup = 'content'; // Default group name, if none was specified\n$groups = [];\n- $hasGroups = false;\n$acceptFileTypes = $this->generalConfig->get('accept_file_types');\nforeach ($fields as $key => $field) {\n@@ -221,10 +220,6 @@ class ContentTypesParser extends BaseParser\n$field['values'] = array_combine($field['values'], $field['values']);\n}\n- if (! empty($field['group'])) {\n- $hasGroups = true;\n- }\n-\nif (empty($field['label'])) {\n$field['label'] = ucwords($key);\n}\n@@ -274,7 +269,7 @@ class ContentTypesParser extends BaseParser\n$fields['slug']['uses'] = (array) $fields['slug']['uses'];\n}\n- return [$fields, $hasGroups ? array_keys($groups) : []];\n+ return [$fields, array_keys($groups)];\n}\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make sure contenttypes _always_ have a group
|
95,144 |
24.11.2019 10:28:15
| -3,600 |
be55894229b3eb9830a519aceb00065ba4423b6c
|
Bump `symplify/easy-coding-standard` to v 7
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"symfony/stopwatch\": \"^4.4\",\n\"symfony/web-profiler-bundle\": \"^4.4\",\n\"symfony/web-server-bundle\": \"^4.4\",\n- \"symplify/easy-coding-standard\": \"^6.1.0\"\n+ \"symplify/easy-coding-standard\": \"^7.0.2\"\n},\n\"config\": {\n\"preferred-install\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"symplify/package-builder\": {\n\"version\": \"v5.2.3\"\n},\n+ \"symplify/set-config-resolver\": {\n+ \"version\": \"v7.0.2\"\n+ },\n+ \"symplify/smart-file-system\": {\n+ \"version\": \"v7.0.2\"\n+ },\n\"theseer/tokenizer\": {\n\"version\": \"1.1.0\"\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Bump `symplify/easy-coding-standard` to v 7
|
95,144 |
24.11.2019 12:37:29
| -3,600 |
0d2614c0b7e965efab1c21f63ef8e6a6a51c38d2
|
Improve fieldtype factory creation
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Content/FieldType.php",
"new_path": "src/Configuration/Content/FieldType.php",
"diff": "@@ -31,6 +31,7 @@ class FieldType extends Collection\n'allow_twig' => false,\n'allow_html' => false,\n'sanitise' => false,\n+ 'localize' => false,\n]);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -236,23 +236,13 @@ class ContentTypesParser extends BaseParser\n$field['sanitise'] = in_array($field['type'], ['text', 'textarea', 'html', 'markdown'], true);\n}\n- // Make sure we have these keys and every field has a group set.\n- $field = array_replace(\n- [\n- 'class' => '',\n- 'default' => '',\n- 'group' => $currentGroup,\n- 'variant' => '',\n- 'localize' => false,\n- ],\n- $field\n- );\n-\n- // Collect group data for rendering.\n- // Make sure that once you started with group all following have that group, too.\n+ if (empty($field['group'])) {\n+ $field['group'] = $currentGroup;\n+ } else {\n$currentGroup = $field['group'];\n- $groups[$currentGroup] = 1;\n+ }\n+ $groups[$currentGroup] = $currentGroup;\n$fields[$key] = $field;\n// Repeating fields checks\n@@ -269,7 +259,7 @@ class ContentTypesParser extends BaseParser\n$fields['slug']['uses'] = (array) $fields['slug']['uses'];\n}\n- return [$fields, array_keys($groups)];\n+ return [$fields, $groups];\n}\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Improve fieldtype factory creation
|
95,144 |
24.11.2019 13:13:33
| -3,600 |
63bc22cac5c1045aa0dfc7364731ce028618f0b9
|
Make sure Fields are Fieldtype
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -7,6 +7,8 @@ namespace Bolt\\Configuration\\Parser;\nuse Bolt\\Common\\Arr;\nuse Bolt\\Common\\Str;\nuse Bolt\\Configuration\\Content\\ContentType;\n+use Bolt\\Configuration\\Content\\FieldType;\n+use Bolt\\Entity\\Field;\nuse Bolt\\Enum\\Statuses;\nuse Bolt\\Exception\\ConfigurationException;\nuse Tightenco\\Collect\\Support\\Collection;\n@@ -186,6 +188,9 @@ class ContentTypesParser extends BaseParser\n$acceptFileTypes = $this->generalConfig->get('accept_file_types');\nforeach ($fields as $key => $field) {\n+ // Convert array into FieldType\n+ $field = new FieldType($field);\n+\n$field['slug'] = $key;\n$key = str_replace('-', '_', mb_strtolower(Str::makeSafe($key, true)));\n@@ -265,12 +270,12 @@ class ContentTypesParser extends BaseParser\n/**\n* Basic validation of repeater fields.\n*/\n- private function parseFieldRepeaters(array $repeater): array\n+ private function parseFieldRepeaters(FieldType $repeater): FieldType\n{\n$blacklist = ['repeater', 'slug', 'templatefield'];\nif (! isset($repeater['fields']) || ! is_array($repeater['fields'])) {\n- return [];\n+ return $repeater;\n}\nforeach ($repeater['fields'] as $repeaterKey => $repeaterField) {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make sure Fields are Fieldtype
|
95,144 |
24.11.2019 13:38:52
| -3,600 |
cb95356dd8c1811e724740d93974f410db329fda
|
Keep allow_html and sanitise as intended
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/skeleton/custom/test.twig",
"new_path": "public/theme/skeleton/custom/test.twig",
"diff": "</p>\n<p>\n- Default output for <code>type: html</code>:<br>\n+ Default output for <code>type: textarea</code>:<br>\n<div class=\"box text_textarea\">{{ record.textarea_field }}</div><br>\n</p>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Content/FieldType.php",
"new_path": "src/Configuration/Content/FieldType.php",
"diff": "@@ -8,11 +8,13 @@ use Tightenco\\Collect\\Support\\Collection;\nclass FieldType extends Collection\n{\n- public function __construct($items = [])\n+ public function __construct($items = [], $slug = '')\n{\nparent::__construct(\nstatic::defaults()->merge($items)\n);\n+\n+ $items['slug'] = $slug;\n}\nprivate static function defaults(): Collection\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/ContentTypesParser.php",
"new_path": "src/Configuration/Parser/ContentTypesParser.php",
"diff": "@@ -188,11 +188,6 @@ class ContentTypesParser extends BaseParser\n$acceptFileTypes = $this->generalConfig->get('accept_file_types');\nforeach ($fields as $key => $field) {\n- // Convert array into FieldType\n- $field = new FieldType($field);\n-\n- $field['slug'] = $key;\n-\n$key = str_replace('-', '_', mb_strtolower(Str::makeSafe($key, true)));\nif (! isset($field['type']) || empty($field['type'])) {\n$error = sprintf('Field \"%s\" has no \"type\" set.', $key);\n@@ -233,10 +228,6 @@ class ContentTypesParser extends BaseParser\n$field['allow_html'] = in_array($field['type'], ['html', 'markdown'], true);\n}\n- if (isset($field['allow_twig']) === false) {\n- $field['allow_twig'] = false;\n- }\n-\nif (isset($field['sanitise']) === false) {\n$field['sanitise'] = in_array($field['type'], ['text', 'textarea', 'html', 'markdown'], true);\n}\n@@ -247,8 +238,9 @@ class ContentTypesParser extends BaseParser\n$currentGroup = $field['group'];\n}\n+ // Convert array into FieldType\n+ $fields[$key] = new FieldType($field, $key);\n$groups[$currentGroup] = $currentGroup;\n- $fields[$key] = $field;\n// Repeating fields checks\nif ($field['type'] === 'repeater') {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Keep allow_html and sanitise as intended
|
95,144 |
24.11.2019 13:58:16
| -3,600 |
54c57876bd72007e058ae65fb18a8d3b5a3f1696
|
Make sure slug is set correctly
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Content/FieldType.php",
"new_path": "src/Configuration/Content/FieldType.php",
"diff": "@@ -8,18 +8,21 @@ use Tightenco\\Collect\\Support\\Collection;\nclass FieldType extends Collection\n{\n- public function __construct($items = [], $slug = '')\n+ public function __construct($items, ?string $slug = null)\n{\n+ if ($slug) {\n+ $items['slug'] = $slug;\n+ }\n+\nparent::__construct(\nstatic::defaults()->merge($items)\n);\n-\n- $items['slug'] = $slug;\n}\nprivate static function defaults(): Collection\n{\nreturn new Collection([\n+ 'slug' => '',\n'type' => '',\n'class' => '',\n'group' => '',\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/php/Configuration/Parser/ContentTypesParserTest.php",
"new_path": "tests/php/Configuration/Parser/ContentTypesParserTest.php",
"diff": "@@ -17,7 +17,7 @@ class ContentTypesParserTest extends ParserTestBase\npublic const AMOUNT_OF_ATTRIBUTES_IN_CONTENT_TYPE = 22;\n- public const AMOUNT_OF_ATTRIBUTES_IN_FIELD = 14;\n+ public const AMOUNT_OF_ATTRIBUTES_IN_FIELD = 15;\npublic function testCanParse(): void\n{\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make sure slug is set correctly
|
95,144 |
26.11.2019 18:23:32
| -3,600 |
5034af4c53f33b6946a93376d66119854447b3b4
|
Only output languageswitcher, if locales have been defined
|
[
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_languageselect.html.twig",
"new_path": "templates/helpers/_languageselect.html.twig",
"diff": "@@ -20,7 +20,7 @@ The current locale is in the Request object, which is an instance of `Symfony\\Co\n{% set class = 'class=\"languageselect_' ~ type ~ (class is defined ? ' ' ~ class) ~ '\"' %}\n{% set style = (style is defined ? ' style=\"' ~ style ~ '\"') %}\n-{% if type == 'list' %}\n+{% if type == 'list' and locales()|length %}\n<ul {{ class|raw }} {{ style|raw }}>\n{% for locale in locales() %}\n<li class=\"{{ locale.current ? 'current': '' }}\">\n@@ -30,7 +30,7 @@ The current locale is in the Request object, which is an instance of `Symfony\\Co\n</ul>\n{% endif %}\n-{% if type == 'select' %}\n+{% if type == 'select' and locales()|length %}\n<select name=\"languageselect_list\" type=\"select\" {{ class|raw }} {{ style|raw }}\nonchange=\"if( this.options[this.selectedIndex].value != '' ) location.href=this.options[this.selectedIndex].value;\">\n{% for locale in locales() %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Only output languageswitcher, if locales have been defined
|
95,144 |
27.11.2019 07:37:28
| -3,600 |
db223a963e54e1c482627d1cbd92859fda6bfcf9
|
Allow `locale` to be `null` (if locale was removed from existing contenttype)
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field.php",
"new_path": "src/Entity/Field.php",
"diff": "@@ -238,7 +238,7 @@ class Field implements Translatable, FieldInterface\nreturn $this;\n}\n- public function setLocale(string $locale): void\n+ public function setLocale(?string $locale): void\n{\n$this->locale = $locale;\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Allow `locale` to be `null` (if locale was removed from existing contenttype)
|
95,144 |
28.11.2019 07:00:33
| -3,600 |
24082e615354739546a6b03fa2eff37e4c2a2d4b
|
Minor updates for Kernel.php for SF 4.4
|
[
{
"change_type": "MODIFY",
"old_path": "src/Kernel.php",
"new_path": "src/Kernel.php",
"diff": "@@ -24,7 +24,7 @@ class Kernel extends BaseKernel\n{\nuse MicroKernelTrait;\n- public const CONFIG_EXTS = '.{php,xml,yaml,yml}';\n+ private const CONFIG_EXTS = '.{php,xml,yaml,yml}';\npublic function getCacheDir()\n{\n@@ -36,11 +36,16 @@ class Kernel extends BaseKernel\nreturn $this->getProjectDir() . '/var/log';\n}\n- public function registerBundles()\n+ public function getProjectDir(): string\n+ {\n+ return \\dirname(__DIR__);\n+ }\n+\n+ public function registerBundles(): iterable\n{\n$contents = require $this->getProjectDir() . '/config/bundles.php';\nforeach ($contents as $class => $envs) {\n- if (isset($envs['all']) || isset($envs[$this->environment])) {\n+ if ($envs[$this->environment] ?? $envs['all'] ?? false) {\nyield new $class();\n}\n}\n@@ -75,7 +80,8 @@ class Kernel extends BaseKernel\nprotected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void\n{\n$container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));\n- $container->setParameter('container.dumper.inline_class_loader', true);\n+ $container->setParameter('container.dumper.inline_class_loader', \\PHP_VERSION_ID < 70400 || !ini_get('opcache.preload'));\n+ $container->setParameter('container.dumper.inline_factories', true);\n$confDir = $this->getProjectDir() . '/config';\n$this->setBoltParameters($container, $confDir);\n@@ -83,7 +89,7 @@ class Kernel extends BaseKernel\n$this->setTaxonomyRequirements($container);\n$loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');\n- $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');\n+ $loader->load($confDir . '/{packages}/' . $this->environment . '/*' . self::CONFIG_EXTS, 'glob');\n$loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');\n$loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Minor updates for Kernel.php for SF 4.4
|
95,144 |
28.11.2019 08:35:53
| -3,600 |
5747e01d6213872191ef98f629e752c3abd3b0be
|
Improvements to fixtures (HTML, Markdown, dates, numbers)
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"bolt/common\": \"^2.1.0\",\n\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n+ \"davidbadura/faker-markdown-generator\": \"^1.0\",\n\"doctrine/doctrine-bundle\": \"^1.12\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n\"doctrine/orm\": \"^2.7\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -10,6 +10,8 @@ use Bolt\\Configuration\\FileLocations;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Enum\\Statuses;\n+use Bolt\\Utils\\Markdown;\n+use DavidBadura\\FakerMarkdownGenerator\\FakerProvider;\nuse Doctrine\\Bundle\\FixturesBundle\\FixtureGroupInterface;\nuse Doctrine\\Common\\DataFixtures\\DependentFixtureInterface;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n@@ -39,12 +41,23 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n/** @var FileLocations */\nprivate $fileLocations;\n- public function __construct(Config $config, FileLocations $fileLocations)\n+ /** @var Markdown */\n+ private $markdown;\n+\n+ /** @var FakerProvider */\n+ private $markdownFaker;\n+\n+ public function __construct(Config $config, FileLocations $fileLocations, Markdown $markdown)\n{\n$this->faker = Factory::create();\n+\n+ /* Note: don't use `$faker->addProvider`, because it'll make PHPStan throw a hissy fit. */\n+ $this->markdownFaker = new FakerProvider($this->faker);\n+\n$this->presetRecords = $this->getPresetRecords();\n$this->config = $config;\n$this->fileLocations = $fileLocations;\n+ $this->markdown = $markdown;\n}\npublic function getDependencies()\n@@ -81,7 +94,7 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\ncontinue;\n}\n- $amount = $contentType['singleton'] ? 1 : (int) ($contentType['listing_records'] * 3);\n+ $amount = $contentType['singleton'] ? 1 : (int) ($contentType['listing_records'] * 1);\nfor ($i = 1; $i <= $amount; $i++) {\nif ($i === 1) {\n@@ -159,8 +172,13 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n{\nswitch ($field['type']) {\ncase 'html':\n- case 'textarea':\n+ $markdown = $this->markdownFaker->markdown();\n+ $data = [$this->markdown->parse($markdown)];\n+ break;\ncase 'markdown':\n+ $data = [$this->markdownFaker->markdown()];\n+ break;\n+ case 'textarea':\n$data = [$this->faker->paragraphs(3, true)];\nbreak;\ncase 'image':\n@@ -177,7 +195,8 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n$data = $this->lastTitle ?? [$this->faker->sentence(3, true)];\nbreak;\ncase 'text':\n- $data = [$this->faker->sentence(6, true)];\n+ $words = in_array($field['slug'], ['title', 'heading'], true) ? 2 : 7;\n+ $data = [$this->faker->sentence($words, true)];\nbreak;\ncase 'email':\n$data = [$this->faker->email];\n@@ -185,6 +204,13 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\ncase 'templateselect':\n$data = [];\nbreak;\n+ case 'date':\n+ case 'datetime':\n+ $data = [$this->faker->dateTime()->format('c')];\n+ break;\n+ case 'number':\n+ $data = [$this->faker->numberBetween(-100, 1000)];\n+ break;\ndefault:\n$data = [$this->faker->sentence(6, true)];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"config/packages/test/dama_doctrine_test_bundle.yaml\"\n]\n},\n+ \"davidbadura/faker-markdown-generator\": {\n+ \"version\": \"1.0.0\"\n+ },\n+ \"davidbadura/markdown-builder\": {\n+ \"version\": \"1.0.4\"\n+ },\n\"doctrine/annotations\": {\n\"version\": \"v1.5.0\"\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Improvements to fixtures (HTML, Markdown, dates, numbers)
|
95,144 |
28.11.2019 18:23:50
| -3,600 |
098f81f170680c3624ae3bad59a506958abd45a8
|
Add support for `type:hidden` and `type:data` fields
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "assets/scss/modules/editor/fields/_data.scss",
"diff": "+//** Fields | Data\n+\n+.editor--data {\n+\n+ pre {\n+ border: 1px solid #DDD;\n+ padding: 0.5rem;\n+ color: #888;\n+ background: rgba(255, 255, 255, 0.4);\n+ font-size: 0.8rem;\n+ margin: 0;\n+ }\n+\n+ span {\n+ font-size: 0.8rem;\n+ color: #666;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/fields/fields.scss",
"new_path": "assets/scss/modules/editor/fields/fields.scss",
"diff": "@import '_html';\n@import '_textarea';\n+@import '_data';\n@import '_date';\n@import '_image';\n@import '_file';\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -211,6 +211,12 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\ncase 'number':\n$data = [$this->faker->numberBetween(-100, 1000)];\nbreak;\n+ case 'data':\n+ $data = [];\n+ for ($i = 1; $i < 5; $i++) {\n+ $data[$this->faker->sentence(1)] = $this->faker->sentence(4, true);\n+ }\n+ break;\ndefault:\n$data = [$this->faker->sentence(6, true)];\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Entity/Field/DataField.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Entity\\Field;\n+\n+use Bolt\\Common\\Json;\n+use Bolt\\Entity\\Field;\n+use Bolt\\Entity\\FieldInterface;\n+use Doctrine\\ORM\\Mapping as ORM;\n+\n+/**\n+ * @ORM\\Entity\n+ */\n+class DataField extends Field implements FieldInterface\n+{\n+ public function getType(): string\n+ {\n+ return 'data';\n+ }\n+\n+ public function setValue($value): Field\n+ {\n+ if (Json::test($value)) {\n+ $value = Json::json_decode($value);\n+ }\n+\n+ return parent::setValue($value);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/HiddenField.php",
"new_path": "src/Entity/Field/HiddenField.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity\\Field;\n+use Bolt\\Common\\Json;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Entity\\FieldInterface;\nuse Doctrine\\ORM\\Mapping as ORM;\n@@ -17,4 +18,13 @@ class HiddenField extends Field implements FieldInterface\n{\nreturn 'hidden';\n}\n+\n+ public function setValue($value): Field\n+ {\n+ if (Json::test($value)) {\n+ $value = Json::json_decode($value);\n+ }\n+\n+ return parent::setValue($value);\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/fields/data.html.twig",
"diff": "+{% extends '@bolt/_partials/fields/_base.html.twig' %}\n+\n+{% set postfix = \"<strong>Note:</strong> This Field contains internal data, likely added / maintained programmatically. You cannot edit this data.\" %}\n+{% set value = field.value|json_encode %}\n+\n+{% block field %}\n+<div class=\"editor--data\">\n+<input type=\"hidden\" id=\"{{ id }}\" name=\"{{ name }}\" value=\"{{ value }}\" />\n+<pre>\n+{{ field.value|json_encode(constant('JSON_PRETTY_PRINT')) }}\n+</pre>\n+</div>\n+{% endblock %}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/fields/hidden.html.twig",
"diff": "+{% set name = 'fields[' ~ field.name|default('unnamed') ~ ']' %}\n+{% set id = 'field-' ~ field.name|default(name)|default('unnamed') %}\n+{% set value = field.value|json_encode %}\n+\n+<input type=\"hidden\" id=\"{{ id }}\" name=\"{{ name }}\" value=\"{{ value }}\" />\n"
},
{
"change_type": "DELETE",
"old_path": "templates/_partials/fields/value.html.twig",
"new_path": null,
"diff": "-{% extends '@bolt/_partials/fields/_base.html.twig' %}\n-\n-{# check disabled #}\n-{% if disabled is not defined %}\n- {% set disabled = false %}\n-{% endif %}\n-\n-{% block field %}\n- <editor-text\n- :id='{{ id|json_encode }}'\n- :value=\"{{ value|json_encode }}\"\n- :name='{{ name|json_encode }}'\n- :type='{{ class|json_encode }}'\n- :disabled='{{ disabled|json_encode }}'\n- ></editor-text>\n- <span>{{ value|json_encode }}</span>\n-{% endblock %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add support for `type:hidden` and `type:data` fields
|
95,144 |
28.11.2019 18:36:34
| -3,600 |
eb36dc58eff1346cfee4190b13e454343a29a0f1
|
Update _data.scss
|
[
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/fields/_data.scss",
"new_path": "assets/scss/modules/editor/fields/_data.scss",
"diff": "//** Fields | Data\n.editor--data {\n-\npre {\n- border: 1px solid #DDD;\n+ border: 1px solid #ddd;\npadding: 0.5rem;\ncolor: #888;\nbackground: rgba(255, 255, 255, 0.4);\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update _data.scss
|
95,144 |
28.11.2019 21:44:40
| -3,600 |
556f2cea865dc37324ad05f3775bf343c0e65c5f
|
Better fixtures even
|
[
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"bolt/common\": \"^2.1.0\",\n\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n- \"davidbadura/faker-markdown-generator\": \"^1.0\",\n\"doctrine/doctrine-bundle\": \"^1.12\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n\"doctrine/orm\": \"^2.7\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -10,8 +10,7 @@ use Bolt\\Configuration\\FileLocations;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Enum\\Statuses;\n-use Bolt\\Utils\\Markdown;\n-use DavidBadura\\FakerMarkdownGenerator\\FakerProvider;\n+use Bolt\\Utils\\FakeContent;\nuse Doctrine\\Bundle\\FixturesBundle\\FixtureGroupInterface;\nuse Doctrine\\Common\\DataFixtures\\DependentFixtureInterface;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n@@ -41,23 +40,13 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n/** @var FileLocations */\nprivate $fileLocations;\n- /** @var Markdown */\n- private $markdown;\n-\n- /** @var FakerProvider */\n- private $markdownFaker;\n-\n- public function __construct(Config $config, FileLocations $fileLocations, Markdown $markdown)\n+ public function __construct(Config $config, FileLocations $fileLocations)\n{\n$this->faker = Factory::create();\n- /* Note: don't use `$faker->addProvider`, because it'll make PHPStan throw a hissy fit. */\n- $this->markdownFaker = new FakerProvider($this->faker);\n-\n$this->presetRecords = $this->getPresetRecords();\n$this->config = $config;\n$this->fileLocations = $fileLocations;\n- $this->markdown = $markdown;\n}\npublic function getDependencies()\n@@ -126,7 +115,7 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\nif (isset($preset[$name])) {\n$field->setValue($preset[$name]);\n} else {\n- $field->setValue($this->getValuesforFieldType($name, $fieldType));\n+ $field->setValue($this->getValuesforFieldType($name, $fieldType, $contentType['singleton']));\n}\n$field->setSortorder($sortorder++ * 5);\n@@ -168,15 +157,16 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\nreturn $statuses[array_rand($statuses)];\n}\n- private function getValuesforFieldType(string $name, DeepCollection $field): array\n+ private function getValuesforFieldType(string $name, DeepCollection $field, bool $singleton): array\n{\n+ $nb = $singleton ? 8 : 4;\n+\nswitch ($field['type']) {\ncase 'html':\n- $markdown = $this->markdownFaker->markdown();\n- $data = [$this->markdown->parse($markdown)];\n+ $data = [FakeContent::generateHTML($nb)];\nbreak;\ncase 'markdown':\n- $data = [$this->markdownFaker->markdown()];\n+ $data = [FakeContent::generateMarkdown($nb)];\nbreak;\ncase 'textarea':\n$data = [$this->faker->paragraphs(3, true)];\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Utils/FakeContent.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Utils;\n+\n+use Faker\\Provider\\Lorem;\n+\n+class FakeContent extends Lorem\n+{\n+ public static function generateMarkdown($loops = 5): string\n+ {\n+ $parts = [];\n+ $last = 'list';\n+\n+ do {\n+ if (self::randomDigit() > 3) {\n+ $parts[] = self::markdownParagraphs(($loops * 2) - 2);\n+ $last = 'paragraphs';\n+ }\n+\n+ if (self::randomDigit() > 8) {\n+ $parts[] = self::markdownBlockquote();\n+ $last = 'blockquote';\n+ }\n+\n+ if (self::randomDigit() > 8 && $last !== 'list') {\n+ $parts[] = self::markdownBulletedList();\n+ $last = 'list';\n+ }\n+\n+ if (self::randomDigit() > 8 && $last !== 'list') {\n+ $parts[] = self::markdownOrderedList();\n+ $last = 'list';\n+ }\n+ } while ($loops-- > 0 || count($parts) < 3);\n+\n+ return implode(\"\\n\", $parts);\n+ }\n+\n+ public static function generateHTML($loops = 5): string\n+ {\n+ $res = self::generateMarkdown($loops);\n+\n+ $markdown = new Markdown();\n+\n+ return $markdown->parse($res);\n+ }\n+\n+ private static function markdownParagraphs(int $nbSentences = 3, bool $variableNbSentences = true): string\n+ {\n+ return self::paragraph($nbSentences, $variableNbSentences) . \"\\n\";\n+ }\n+\n+ private static function markdownBulletedList(int $nbSentences = 3): string\n+ {\n+ $res = '';\n+\n+ foreach (self::sentences($nbSentences) as $element) {\n+ $res .= '* ' . $element . \"\\n\";\n+ }\n+\n+ return $res;\n+ }\n+\n+ private static function markdownOrderedList(int $nbSentences = 3): string\n+ {\n+ $res = '';\n+\n+ foreach (self::sentences($nbSentences) as $key => $element) {\n+ $res .= ($key + 1) . '. ' . $element . \"\\n\";\n+ }\n+\n+ return $res;\n+ }\n+\n+ private static function markdownBlockquote(int $nbSentences = 3): string\n+ {\n+ $res = '';\n+\n+ foreach (self::sentences($nbSentences) as $element) {\n+ $res .= '> ' . $element . \"\\n\";\n+ }\n+\n+ return $res;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "symfony.lock",
"new_path": "symfony.lock",
"diff": "\"config/packages/test/dama_doctrine_test_bundle.yaml\"\n]\n},\n- \"davidbadura/faker-markdown-generator\": {\n- \"version\": \"1.0.0\"\n- },\n- \"davidbadura/markdown-builder\": {\n- \"version\": \"1.0.4\"\n- },\n\"doctrine/annotations\": {\n\"version\": \"v1.5.0\"\n},\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Better fixtures even
|
95,144 |
29.11.2019 20:01:31
| -3,600 |
817fbb6db41181a1bce2024bd30081893aa8c9d4
|
Have thumbnails create the correct links
|
[
{
"change_type": "MODIFY",
"old_path": "src/Twig/ImageExtension.php",
"new_path": "src/Twig/ImageExtension.php",
"diff": "@@ -101,7 +101,7 @@ class ImageExtension extends AbstractExtension\n*/\npublic function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null, ?string $fit = null)\n{\n- $filename = $this->getFilename($image);\n+ $filename = $this->getFilename($image, true);\nif (empty($filename)) {\nreturn '';\n@@ -151,7 +151,7 @@ class ImageExtension extends AbstractExtension\n/**\n* @param ImageField|Content|array|string $image\n*/\n- private function getFilename($image): ?string\n+ private function getFilename($image, bool $relative = false): ?string\n{\n$filename = null;\n@@ -159,12 +159,12 @@ class ImageExtension extends AbstractExtension\n$image = $this->getImageFromContent($image);\n}\n- if ($image instanceof ImageField) {\n- $filename = $image->get('filename');\n- } elseif (is_array($image)) {\n+ if (is_array($image)) {\n$filename = $image['filename'];\n- } elseif (is_string($image)) {\n- $filename = $image;\n+ } elseif ($relative && ($image instanceof ImageField)) {\n+ $filename = $image->get('filename');\n+ } else {\n+ $filename = (string) $image;\n}\nreturn $filename;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Have thumbnails create the correct links
|
95,144 |
01.12.2019 08:33:23
| -3,600 |
a2dfc8efb562a0a81dbc2b58f08231769d10a625
|
Preparing for beta 5 release
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"integrity\": \"sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==\"\n},\n\"@vue/test-utils\": {\n- \"version\": \"1.0.0-beta.29\",\n- \"resolved\": \"https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz\",\n- \"integrity\": \"sha512-yX4sxEIHh4M9yAbLA/ikpEnGKMNBCnoX98xE1RwxfhQVcn0MaXNSj1Qmac+ZydTj6VBSEVukchBogXBTwc+9iA==\",\n+ \"version\": \"1.0.0-beta.30\",\n+ \"resolved\": \"https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz\",\n+ \"integrity\": \"sha512-Wyvcha9fNk8+kzTDwb3xWGjPkCPzHSYSwKP6MplrPTG/auhqoad7JqUEceZLc6u7AU4km2pPQ8/m9s0RgCZ0NA==\",\n\"dev\": true,\n\"requires\": {\n\"dom-event-types\": \"^1.0.0\",\n- \"lodash\": \"^4.17.4\"\n+ \"lodash\": \"^4.17.15\",\n+ \"pretty\": \"^2.0.0\"\n}\n},\n\"@vue/web-component-wrapper\": {\n\"integrity\": \"sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==\"\n},\n\"autoprefixer\": {\n- \"version\": \"9.7.2\",\n- \"resolved\": \"https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.2.tgz\",\n- \"integrity\": \"sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA==\",\n+ \"version\": \"9.7.3\",\n+ \"resolved\": \"https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.3.tgz\",\n+ \"integrity\": \"sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==\",\n\"requires\": {\n- \"browserslist\": \"^4.7.3\",\n- \"caniuse-lite\": \"^1.0.30001010\",\n+ \"browserslist\": \"^4.8.0\",\n+ \"caniuse-lite\": \"^1.0.30001012\",\n\"chalk\": \"^2.4.2\",\n\"normalize-range\": \"^0.1.2\",\n\"num2fraction\": \"^1.2.2\",\n\"postcss-value-parser\": \"^4.0.2\"\n},\n\"dependencies\": {\n+ \"browserslist\": {\n+ \"version\": \"4.8.0\",\n+ \"resolved\": \"https://registry.npmjs.org/browserslist/-/browserslist-4.8.0.tgz\",\n+ \"integrity\": \"sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA==\",\n+ \"requires\": {\n+ \"caniuse-lite\": \"^1.0.30001012\",\n+ \"electron-to-chromium\": \"^1.3.317\",\n+ \"node-releases\": \"^1.1.41\"\n+ }\n+ },\n+ \"electron-to-chromium\": {\n+ \"version\": \"1.3.319\",\n+ \"resolved\": \"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.319.tgz\",\n+ \"integrity\": \"sha512-t/lYNZPwS9jLJ9SBLGd6ERYtCtsYPAXzsE1VYLshrUWpQCTAswO1pERZV4iOZipW2uVsGQrJtm2iWiYVp1zTZw==\"\n+ },\n\"postcss-value-parser\": {\n\"version\": \"4.0.2\",\n\"resolved\": \"https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz\",\n}\n},\n\"bootstrap\": {\n- \"version\": \"4.4.0\",\n- \"resolved\": \"https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.0.tgz\",\n- \"integrity\": \"sha512-dqCYJNs/Fxa3IVQ+v/lC694POCThUjZsA4wwqs8l+yk67B6ww2Ki++WaM6CVGe5+tArBBrknzjjh01/NT5rLjA==\"\n+ \"version\": \"4.4.1\",\n+ \"resolved\": \"https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz\",\n+ \"integrity\": \"sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==\"\n},\n\"brace-expansion\": {\n\"version\": \"1.1.11\",\n}\n},\n\"eslint\": {\n- \"version\": \"6.7.1\",\n- \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.7.1.tgz\",\n- \"integrity\": \"sha512-UWzBS79pNcsDSxgxbdjkmzn/B6BhsXMfUaOHnNwyE8nD+Q6pyT96ow2MccVayUTV4yMid4qLhMiQaywctRkBLA==\",\n+ \"version\": \"6.7.2\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz\",\n+ \"integrity\": \"sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/code-frame\": \"^7.0.0\",\n}\n},\n\"luxon\": {\n- \"version\": \"1.21.2\",\n- \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.21.2.tgz\",\n- \"integrity\": \"sha512-yshwnlkA79WfC24/BC9Rd1n0mhorP22Sc7GYn0puRU6wD/douCgNJIzI9qQBuT9m2/bU+n9v1RflVNE4rMPPxQ==\"\n+ \"version\": \"1.21.3\",\n+ \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.21.3.tgz\",\n+ \"integrity\": \"sha512-lLRwNcNnkZLuv13A1FUuZRZmTWF7ro2ricYvb0L9cvBYHPvZhQdKwrYnZzi103D2XKmlVmxWpdn2wfIiOt2YEw==\"\n},\n\"make-dir\": {\n\"version\": \"1.3.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"name\": \"bolt\",\n- \"version\": \"4.0.0-beta.2\",\n+ \"version\": \"4.0.0-beta.5\",\n\"homepage\": \"https://boltcms.io\",\n\"author\": \"Bob den Otter <bob@twokings.nl> (https://boltcms.io)\",\n\"license\": \"MIT\",\n\"axios\": \"^0.19.0\",\n\"baguettebox.js\": \"^1.11.0\",\n\"bootbox\": \"^5.3.4\",\n- \"bootstrap\": \"^4.4\",\n+ \"bootstrap\": \"^4.4.1\",\n\"codemirror\": \"^5.49.2\",\n\"dropzone\": \"^5.5.1\",\n\"flagpack\": \"^1.0.4\",\n\"jquery\": \"^3.4.1\",\n- \"luxon\": \"^1.21\",\n+ \"luxon\": \"^1.21.3\",\n\"no-scroll\": \"^2.1.1\",\n\"popper.js\": \"^1.16.0\",\n\"register-service-worker\": \"^1.6.2\",\n\"@babel/preset-env\": \"^7.7.4\",\n\"@fortawesome/fontawesome-free\": \"^5.11.2\",\n\"@symfony/webpack-encore\": \"^0.28.2\",\n- \"@vue/test-utils\": \"^1.0.0-beta.29\",\n+ \"@vue/test-utils\": \"^1.0.0-beta.30\",\n\"ajv-keywords\": \"^3.4.1\",\n- \"autoprefixer\": \"^9.7.2\",\n+ \"autoprefixer\": \"^9.7.3\",\n\"babel-core\": \"^7.0.0-bridge.0\",\n\"babel-eslint\": \"^10.0.3\",\n\"babel-jest\": \"^24.9.0\",\n- \"eslint\": \"^6.7.1\",\n+ \"eslint\": \"^6.7.2\",\n\"eslint-config-prettier\": \"^6.7.0\",\n\"eslint-plugin-prettier\": \"^3.1.1\",\n\"eslint-plugin-standard\": \"^4.0.1\",\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Preparing for beta 5 release
|
95,144 |
01.12.2019 16:17:35
| -3,600 |
17ddf896c2a52d79f7aa766209c2177b948ede52
|
Controllers in extensions need access to Config and Services
|
[
{
"change_type": "MODIFY",
"old_path": "src/Extension/BaseExtension.php",
"new_path": "src/Extension/BaseExtension.php",
"diff": "@@ -4,24 +4,14 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\n-use Bolt\\Configuration\\Config;\n-use Bolt\\Event\\Subscriber\\ExtensionSubscriber;\nuse Bolt\\Widget\\WidgetInterface;\nuse Bolt\\Widgets;\nuse Cocur\\Slugify\\Slugify;\nuse Composer\\Package\\CompletePackage;\nuse Composer\\Package\\PackageInterface;\nuse ComposerPackages\\Packages;\n-use Doctrine\\Common\\Persistence\\ObjectManager;\nuse Symfony\\Bundle\\TwigBundle\\Loader\\NativeFilesystemLoader;\n-use Symfony\\Component\\DependencyInjection\\ContainerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\n-use Symfony\\Component\\Filesystem\\Filesystem;\n-use Symfony\\Component\\HttpFoundation\\Session\\Session;\n-use Symfony\\Component\\Stopwatch\\Stopwatch;\n-use Symfony\\Component\\Yaml\\Parser;\n-use Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface;\n-use Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Environment;\nuse Twig\\Extension\\ExtensionInterface as TwigExtensionInterface;\nuse Twig\\Loader\\FilesystemLoader;\n@@ -31,17 +21,8 @@ use Twig\\Loader\\FilesystemLoader;\n*/\nabstract class BaseExtension implements ExtensionInterface\n{\n- /** @var Collection */\n- private $config;\n-\n- /** @var EventDispatcherInterface */\n- private $eventDispatcher;\n-\n- /** @var ObjectManager */\n- private $objectManager;\n-\n- /** @var ContainerInterface */\n- private $container;\n+ use ServicesTrait;\n+ use ConfigTrait;\n/** @var string */\nprivate $slug;\n@@ -66,84 +47,6 @@ abstract class BaseExtension implements ExtensionInterface\nreturn $this->slug;\n}\n- /**\n- * Returns the classname of the Extension\n- */\n- public function getClass(): string\n- {\n- return static::class;\n- }\n-\n- public function getConfig(): Collection\n- {\n- if ($this->config === null) {\n- $this->initializeConfig();\n- }\n-\n- return $this->config;\n- }\n-\n- private function initializeConfig(): void\n- {\n- $config = [];\n-\n- $filenames = $this->getConfigFilenames();\n-\n- if (! is_readable($filenames['main']) && is_readable($this->getDefaultConfigFilename())) {\n- $filesystem = new Filesystem();\n- $filesystem->copy($this->getDefaultConfigFilename(), $filenames['main']);\n- }\n-\n- $yamlParser = new Parser();\n-\n- foreach ($filenames as $filename) {\n- if (is_readable($filename)) {\n- $config = array_merge($config, $yamlParser->parseFile($filename));\n- }\n- }\n-\n- $this->config = new Collection($config);\n- }\n-\n- public function getConfigFilenames(): array\n- {\n- $slugify = new Slugify();\n- $base = $slugify->slugify(str_replace('Extension', '', $this->getClass()));\n- $path = $this->getBoltConfig()->getPath('extensions_config');\n-\n- return [\n- 'main' => sprintf('%s%s%s.yaml', $path, DIRECTORY_SEPARATOR, $base),\n- 'local' => sprintf('%s%s%s_local.yaml', $path, DIRECTORY_SEPARATOR, $base),\n- ];\n- }\n-\n- public function hasConfigFilenames(): array\n- {\n- $result = [];\n-\n- foreach ($this->getConfigFilenames() as $filename) {\n- if (is_readable($filename)) {\n- $result[] = basename(dirname($filename)) . DIRECTORY_SEPARATOR . basename($filename);\n- }\n- }\n-\n- return $result;\n- }\n-\n- private function getDefaultConfigFilename(): string\n- {\n- $reflection = new \\ReflectionClass($this);\n-\n- return sprintf(\n- '%s%s%s%s%s',\n- dirname(dirname($reflection->getFilename())),\n- DIRECTORY_SEPARATOR,\n- 'config',\n- DIRECTORY_SEPARATOR,\n- 'config.yaml'\n- );\n- }\n-\n/**\n* Called when initialising the Extension. Use this to register widgets or\n* do other tasks after boot.\n@@ -153,18 +56,6 @@ abstract class BaseExtension implements ExtensionInterface\n// Nothing\n}\n- /**\n- * Injects commonly used objects into the extension, for use by the\n- * extension. Called from the listener.\n- *\n- * @see ExtensionSubscriber\n- */\n- public function injectObjects(array $objects): void\n- {\n- $this->objectManager = $objects['manager'];\n- $this->container = $objects['container'];\n- }\n-\n/**\n* Shortcut method to register a widget and inject the extension into it\n*/\n@@ -236,7 +127,7 @@ abstract class BaseExtension implements ExtensionInterface\npublic function addListener($event, $callback): void\n{\n/** @var EventDispatcher $dp */\n- $dp = $this->eventDispatcher;\n+ $dp = $this->getEventDispatcher();\n$dp->addListener($event, $callback);\n}\n@@ -280,79 +171,4 @@ abstract class BaseExtension implements ExtensionInterface\nreturn $package->current();\n}\n-\n- /**\n- * This bit of code allows us to get services from the container, even if\n- * they are not marked public. We need to be able to do this, because we\n- * can't anticipate which services an extension's author will want to get,\n- * and neither should we want to make them all public. So, we resort to\n- * this, regardless of them being private / public. With great power comes\n- * great responsibility.\n- *\n- * Note: We wouldn't have to do this, if we could Autowire services in our\n- * own code. If you have good ideas on how to accomplish that, we'd be\n- * happy to hear from your ideas.\n- *\n- * @throws \\ReflectionException\n- */\n- public function getService(string $name)\n- {\n- $container = $this->getContainer();\n-\n- if ($container->has($name)) {\n- return $container->get($name);\n- }\n-\n- $reflectedContainer = new \\ReflectionClass($container);\n- $reflectionProperty = $reflectedContainer->getProperty('privates');\n- $reflectionProperty->setAccessible(true);\n-\n- $privateServices = $reflectionProperty->getValue($container);\n-\n- if (array_key_exists($name, $privateServices)) {\n- return $privateServices[$name];\n- }\n-\n- return null;\n- }\n-\n- public function getWidgets(): ?Widgets\n- {\n- return $this->getService(\\Bolt\\Widgets::class);\n- }\n-\n- public function getBoltConfig(): Config\n- {\n- return $this->getService(\\Bolt\\Configuration\\Config::class);\n- }\n-\n- public function getTwig(): Environment\n- {\n- return $this->getService('twig');\n- }\n-\n- public function getSession(): Session\n- {\n- return $this->getService('session');\n- }\n-\n- public function getEventDispatcher(): EventDispatcherInterface\n- {\n- return $this->getService('event_dispatcher');\n- }\n-\n- public function getObjectManager(): ObjectManager\n- {\n- return $this->objectManager;\n- }\n-\n- public function getStopwatch(): Stopwatch\n- {\n- return $this->getService('debug.stopwatch');\n- }\n-\n- public function getContainer(): ContainerInterface\n- {\n- return $this->container;\n- }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Extension/ConfigTrait.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+use Cocur\\Slugify\\Slugify;\n+use Symfony\\Component\\Filesystem\\Filesystem;\n+use Symfony\\Component\\Yaml\\Parser;\n+use Tightenco\\Collect\\Support\\Collection;\n+\n+trait ConfigTrait\n+{\n+ /** @var Collection */\n+ private $config;\n+\n+ /**\n+ * Returns the classname of the Extension\n+ */\n+ public function getClass(): string\n+ {\n+ return static::class;\n+ }\n+\n+ public function getConfig(): Collection\n+ {\n+ if ($this->config === null) {\n+ $this->initializeConfig();\n+ }\n+\n+ return $this->config;\n+ }\n+\n+ private function initializeConfig(): void\n+ {\n+ $config = [];\n+\n+ $filenames = $this->getConfigFilenames();\n+\n+ if (! is_readable($filenames['main']) && is_readable($this->getDefaultConfigFilename())) {\n+ $filesystem = new Filesystem();\n+ $filesystem->copy($this->getDefaultConfigFilename(), $filenames['main']);\n+ }\n+\n+ $yamlParser = new Parser();\n+\n+ foreach ($filenames as $filename) {\n+ if (is_readable($filename)) {\n+ $config = array_merge($config, $yamlParser->parseFile($filename));\n+ }\n+ }\n+\n+ $this->config = new Collection($config);\n+ }\n+\n+ public function getConfigFilenames(): array\n+ {\n+ $slugify = new Slugify();\n+ $base = $slugify->slugify(str_replace('Extension', '', $this->getClass()));\n+ $path = $this->getBoltConfig()->getPath('extensions_config');\n+\n+ return [\n+ 'main' => sprintf('%s%s%s.yaml', $path, DIRECTORY_SEPARATOR, $base),\n+ 'local' => sprintf('%s%s%s_local.yaml', $path, DIRECTORY_SEPARATOR, $base),\n+ ];\n+ }\n+\n+ public function hasConfigFilenames(): array\n+ {\n+ $result = [];\n+\n+ foreach ($this->getConfigFilenames() as $filename) {\n+ if (is_readable($filename)) {\n+ $result[] = basename(dirname($filename)) . DIRECTORY_SEPARATOR . basename($filename);\n+ }\n+ }\n+\n+ return $result;\n+ }\n+\n+ private function getDefaultConfigFilename(): string\n+ {\n+ $reflection = new \\ReflectionClass($this);\n+\n+ return sprintf(\n+ '%s%s%s%s%s',\n+ dirname(dirname($reflection->getFilename())),\n+ DIRECTORY_SEPARATOR,\n+ 'config',\n+ DIRECTORY_SEPARATOR,\n+ 'config.yaml'\n+ );\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Extension/ExtensionController.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+use Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController;\n+\n+class ExtensionController extends AbstractController\n+{\n+ use ServicesTrait;\n+ use ConfigTrait;\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Extension/ServicesTrait.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+use Bolt\\Configuration\\Config;\n+use Bolt\\Widgets;\n+use Doctrine\\Common\\Persistence\\ObjectManager;\n+use Psr\\Container\\ContainerInterface;\n+use Symfony\\Component\\HttpFoundation\\Session\\Session;\n+use Symfony\\Component\\Stopwatch\\Stopwatch;\n+use Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface;\n+use Twig\\Environment;\n+\n+trait ServicesTrait\n+{\n+ /** @var ObjectManager */\n+ protected $objectManager;\n+\n+ /** @var ContainerInterface */\n+ protected $container;\n+\n+ /**\n+ * Injects commonly used objects into the extension, for use by the\n+ * extension. Called from the listener.\n+ *\n+ * @see ExtensionSubscriber\n+ */\n+ public function injectObjects(array $objects): void\n+ {\n+ $this->objectManager = $objects['manager'];\n+ $this->container = $objects['container'];\n+ }\n+\n+ /**\n+ * This bit of code allows us to get services from the container, even if\n+ * they are not marked public. We need to be able to do this, because we\n+ * can't anticipate which services an extension's author will want to get,\n+ * and neither should we want to make them all public. So, we resort to\n+ * this, regardless of them being private / public. With great power comes\n+ * great responsibility.\n+ *\n+ * Note: We wouldn't have to do this, if we could Autowire services in our\n+ * own code. If you have good ideas on how to accomplish that, we'd be\n+ * happy to hear from your ideas.\n+ *\n+ * @throws \\ReflectionException\n+ */\n+ public function getService(string $name)\n+ {\n+ $container = $this->getContainer();\n+\n+ if ($container->has($name)) {\n+ return $container->get($name);\n+ }\n+\n+ $reflectedContainer = new \\ReflectionClass($container);\n+ $reflectionProperty = $reflectedContainer->getProperty('privates');\n+ $reflectionProperty->setAccessible(true);\n+\n+ $privateServices = $reflectionProperty->getValue($container);\n+\n+ if (array_key_exists($name, $privateServices)) {\n+ return $privateServices[$name];\n+ }\n+\n+ return null;\n+ }\n+\n+ public function getWidgets(): ?Widgets\n+ {\n+ return $this->getService(\\Bolt\\Widgets::class);\n+ }\n+\n+ public function getBoltConfig(): Config\n+ {\n+ return $this->getService(\\Bolt\\Configuration\\Config::class);\n+ }\n+\n+ public function getTwig(): Environment\n+ {\n+ return $this->getService('twig');\n+ }\n+\n+ public function getSession(): Session\n+ {\n+ return $this->getService('session');\n+ }\n+\n+ public function getEventDispatcher(): EventDispatcherInterface\n+ {\n+ return $this->getService('event_dispatcher');\n+ }\n+\n+ public function getObjectManager(): ObjectManager\n+ {\n+ return $this->objectManager;\n+ }\n+\n+ public function getStopwatch(): Stopwatch\n+ {\n+ return $this->getService('debug.stopwatch');\n+ }\n+\n+ public function getContainer(): ContainerInterface\n+ {\n+ return $this->container;\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Controllers in extensions need access to Config and Services
|
95,144 |
03.12.2019 07:44:21
| -3,600 |
18adb7deec74dfe26b5df3e998a6656504d74b00
|
Starting work on supporting canonical URLs
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Canonical.php",
"diff": "+<?php\n+\n+\n+namespace Bolt;\n+\n+\n+use Bolt\\Configuration\\Config;\n+use GuzzleHttp\\Psr7\\Uri;\n+use Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\HttpFoundation\\RequestStack;\n+use Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n+\n+class Canonical\n+{\n+ /** @var Config */\n+ private $config;\n+\n+ /** @var UrlGeneratorInterface */\n+ private $urlGenerator;\n+\n+ /** @var Request */\n+ private $request;\n+\n+ /** @var string */\n+ private $scheme = null;\n+\n+ /** @var string */\n+ private $host = null;\n+\n+ /** @var string */\n+ private $port = null;\n+\n+ /** @var string */\n+ private $path = null;\n+\n+ public function __construct(Config $config, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack)\n+ {\n+ $this->config = $config;\n+ $this->urlGenerator = $urlGenerator;\n+ $this->request = $requestStack->getCurrentRequest();\n+\n+ $this->init();\n+ }\n+\n+ public function init()\n+ {\n+ // Ensure in request cycle (even for override).\n+ if ($this->request === null) {\n+ return null;\n+ }\n+\n+ $requestUrl = parse_url($this->request->getSchemeAndHttpHost());\n+\n+ $configCanonical = $this->config->get('general/canonical', $this->request->getSchemeAndHttpHost());\n+// dd($this->request->getSchemeAndHttpHost(), $configCanonical);\n+\n+ if (strpos($configCanonical, 'http') !== 0) {\n+ $configCanonical = $requestUrl['scheme'] . '://' . $configCanonical;\n+ }\n+\n+ $configUrl = parse_url($configCanonical);\n+\n+\n+ $this->setScheme($configUrl['scheme']);\n+ $this->setHost($configUrl['host']);\n+ $this->setPort($configUrl['port'] ?? null);\n+\n+ }\n+\n+\n+ public function get()\n+ {\n+ // Ensure request has been matched\n+ if (!$this->request->attributes->get('_route')) {\n+ return null;\n+ }\n+\n+ $url = sprintf(\"%s://%s%s%s\",\n+ $this->getScheme(),\n+ $this->getHost(),\n+ ($this->getPort() ? ':' . $this->getPort() : ''),\n+ $this->getPath()\n+ );\n+\n+ return $url;\n+\n+ }\n+\n+ /**\n+ * Override the initial UrlGeneratorInterface\n+ */\n+ public function setUrlGenerator(UrlGeneratorInterface $urlGenerator): void\n+ {\n+ $this->urlGenerator = $urlGenerator;\n+ }\n+\n+ /**\n+ * Override the scheme\n+ */\n+ public function setScheme(string $scheme): void\n+ {\n+ $this->scheme = trim($scheme, ':/');\n+ }\n+\n+ public function getScheme(): string\n+ {\n+ return $this->scheme;\n+ }\n+\n+\n+ /**\n+ * @return string\n+ */\n+ public function getPort(): ?string\n+ {\n+ return $this->port;\n+ }\n+\n+ /**\n+ * @param string $port\n+ */\n+ public function setPort(?string $port): void\n+ {\n+ $this->port = $port;\n+ }\n+\n+ /**\n+ * @return string\n+ */\n+ public function getHost(): string\n+ {\n+ return $this->host;\n+ }\n+\n+ /**\n+ * @param string $host\n+ */\n+ public function setHost(string $host): void\n+ {\n+ $this->host = $host;\n+ }\n+\n+ /**\n+ * @return string\n+ */\n+ public function getPath(): string\n+ {\n+ if ($this->path === null) {\n+ $this->path = $this->urlGenerator->generate(\n+ $this->request->attributes->get('_route'),\n+ $this->request->attributes->get('_route_params'),\n+ UrlGeneratorInterface::ABSOLUTE_PATH);\n+ }\n+\n+ return $this->path;\n+ }\n+\n+ /**\n+ * @param string $path\n+ */\n+ public function setPath(string $path): void\n+ {\n+ $this->path = $path;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Parser/GeneralParser.php",
"new_path": "src/Configuration/Parser/GeneralParser.php",
"diff": "@@ -105,7 +105,6 @@ class GeneralParser extends BaseParser\n'filebrowserWindowHeight' => 480,\n],\n],\n- 'canonical' => null,\n'enforce_ssl' => false,\n'thumbnails' => [\n'default_thumbnail' => [160, 120],\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/HtmlExtension.php",
"new_path": "src/Twig/HtmlExtension.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\n+use Bolt\\Canonical;\nuse Bolt\\Utils\\Markdown;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\n@@ -14,11 +15,16 @@ use Twig\\TwigFunction;\n*/\nclass HtmlExtension extends AbstractExtension\n{\n+ /** @var Markdown */\nprivate $markdown;\n- public function __construct(Markdown $markdown)\n+ /** @var Canonical */\n+ private $canonical;\n+\n+ public function __construct(Markdown $markdown, Canonical $canonical)\n{\n$this->markdown = $markdown;\n+ $this->canonical = $canonical;\n}\n/**\n@@ -31,6 +37,7 @@ class HtmlExtension extends AbstractExtension\n];\nreturn [\n+ new TwigFunction('canonical', [$this, 'canonical']),\nnew TwigFunction('markdown', [$this, 'markdown'], $safe),\n];\n}\n@@ -49,6 +56,11 @@ class HtmlExtension extends AbstractExtension\n];\n}\n+ public function canonical()\n+ {\n+ return $this->canonical->get();\n+ }\n+\n/**\n* Transforms the given Markdown content into HTML content.\n*/\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Starting work on supporting canonical URLs
|
95,144 |
03.12.2019 07:47:41
| -3,600 |
3fa71fa2d7e93c83c35eb9c68795a404c7f6170f
|
Set filename for configuration files for Extensions correctly
|
[
{
"change_type": "MODIFY",
"old_path": "src/Extension/ConfigTrait.php",
"new_path": "src/Extension/ConfigTrait.php",
"diff": "@@ -56,12 +56,13 @@ trait ConfigTrait\npublic function getConfigFilenames(): array\n{\n$slugify = new Slugify();\n- $base = $slugify->slugify(str_replace('Extension', '', $this->getClass()));\n+ $baseClassPath = mb_substr($this->getClass(), 0, mb_strrpos($this->getClass(), '\\\\'));\n+ $baseName = $slugify->slugify($baseClassPath);\n$path = $this->getBoltConfig()->getPath('extensions_config');\nreturn [\n- 'main' => sprintf('%s%s%s.yaml', $path, DIRECTORY_SEPARATOR, $base),\n- 'local' => sprintf('%s%s%s_local.yaml', $path, DIRECTORY_SEPARATOR, $base),\n+ 'main' => sprintf('%s%s%s.yaml', $path, DIRECTORY_SEPARATOR, $baseName),\n+ 'local' => sprintf('%s%s%s_local.yaml', $path, DIRECTORY_SEPARATOR, $baseName),\n];\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Set filename for configuration files for Extensions correctly
|
95,144 |
03.12.2019 17:14:34
| -3,600 |
0192b1d765178095ecc0179761bde84b3c34cf22
|
Adding canonical to all frontend pages.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Canonical.php",
"new_path": "src/Canonical.php",
"diff": "<?php\n+declare(strict_types=1);\nnamespace Bolt;\n-\nuse Bolt\\Configuration\\Config;\n-use GuzzleHttp\\Psr7\\Uri;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\RequestStack;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n@@ -42,48 +41,42 @@ class Canonical\n$this->init();\n}\n- public function init()\n+ public function init(): void\n{\n// Ensure in request cycle (even for override).\nif ($this->request === null) {\n- return null;\n+ return;\n}\n$requestUrl = parse_url($this->request->getSchemeAndHttpHost());\n$configCanonical = $this->config->get('general/canonical', $this->request->getSchemeAndHttpHost());\n-// dd($this->request->getSchemeAndHttpHost(), $configCanonical);\n- if (strpos($configCanonical, 'http') !== 0) {\n+ if (mb_strpos($configCanonical, 'http') !== 0) {\n$configCanonical = $requestUrl['scheme'] . '://' . $configCanonical;\n}\n$configUrl = parse_url($configCanonical);\n-\n$this->setScheme($configUrl['scheme']);\n$this->setHost($configUrl['host']);\n$this->setPort($configUrl['port'] ?? null);\n-\n}\n-\n- public function get()\n+ public function get(): string\n{\n// Ensure request has been matched\nif (! $this->request->attributes->get('_route')) {\nreturn null;\n}\n- $url = sprintf(\"%s://%s%s%s\",\n+ return sprintf(\n+ '%s://%s%s%s',\n$this->getScheme(),\n$this->getHost(),\n($this->getPort() ? ':' . $this->getPort() : ''),\n$this->getPath()\n);\n-\n- return $url;\n-\n}\n/**\n@@ -94,6 +87,11 @@ class Canonical\n$this->urlGenerator = $urlGenerator;\n}\n+ public function getUrlGenerator(): UrlGeneratorInterface\n+ {\n+ return $this->urlGenerator;\n+ }\n+\n/**\n* Override the scheme\n*/\n@@ -107,11 +105,10 @@ class Canonical\nreturn $this->scheme;\n}\n-\n/**\n* @return string\n*/\n- public function getPort(): ?string\n+ public function getPort(): ?int\n{\nreturn $this->port;\n}\n@@ -119,47 +116,43 @@ class Canonical\n/**\n* @param string $port\n*/\n- public function setPort(?string $port): void\n+ public function setPort(?int $port): void\n{\n$this->port = $port;\n}\n- /**\n- * @return string\n- */\npublic function getHost(): string\n{\nreturn $this->host;\n}\n- /**\n- * @param string $host\n- */\npublic function setHost(string $host): void\n{\n$this->host = $host;\n}\n- /**\n- * @return string\n- */\npublic function getPath(): string\n{\nif ($this->path === null) {\n$this->path = $this->urlGenerator->generate(\n$this->request->attributes->get('_route'),\n$this->request->attributes->get('_route_params'),\n- UrlGeneratorInterface::ABSOLUTE_PATH);\n+ UrlGeneratorInterface::ABSOLUTE_PATH\n+ );\n}\nreturn $this->path;\n}\n- /**\n- * @param string $path\n- */\n- public function setPath(string $path): void\n+ public function setPath(?string $route = null, array $params = []): void\n{\n- $this->path = $path;\n+ if (! $route) {\n+ $route = $this->request->attributes->get('_route');\n+ }\n+\n+ $this->path = $this->urlGenerator->generate(\n+ $route,\n+ $params\n+ );\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/DetailController.php",
"new_path": "src/Controller/Frontend/DetailController.php",
"diff": "@@ -64,11 +64,17 @@ class DetailController extends TwigAwareController implements FrontendZone\nthrow new NotFoundHttpException('Content is not published');\n}\n- $recordSlug = $record->getDefinition()->get('singular_slug');\n+ $singularSlug = $record->getContentTypeSingularSlug();\n+\n+ // Update the canonical, with the correct path\n+ $this->canonical->setPath(null, [\n+ 'contentTypeSlug' => $record->getContentTypeSingularSlug(),\n+ 'slugOrId' => $record->getSlug(),\n+ ]);\n$context = [\n'record' => $record,\n- $recordSlug => $record,\n+ $singularSlug => $record,\n];\n$templates = $this->templateChooser->forRecord($record);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/TwigAwareController.php",
"new_path": "src/Controller/TwigAwareController.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Controller;\n+use Bolt\\Canonical;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Entity\\Field\\TemplateselectField;\nuse Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController;\n@@ -27,14 +28,18 @@ class TwigAwareController extends AbstractController\n/** @var Packages */\nprotected $packages;\n+ /** @var Canonical */\n+ protected $canonical;\n+\n/**\n* @required\n*/\n- public function setAutowire(Config $config, Environment $twig, Packages $packages): void\n+ public function setAutowire(Config $config, Environment $twig, Packages $packages, Canonical $canonical): void\n{\n$this->config = $config;\n$this->twig = $twig;\n$this->packages = $packages;\n+ $this->canonical = $canonical;\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Event/Subscriber/WidgetSubscriber.php",
"new_path": "src/Event/Subscriber/WidgetSubscriber.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Event\\Subscriber;\n+use Bolt\\Canonical;\nuse Bolt\\Widget\\BoltHeaderWidget;\nuse Bolt\\Widget\\CanonicalLinkWidget;\nuse Bolt\\Widget\\Injector\\RequestZone;\n@@ -21,9 +22,13 @@ class WidgetSubscriber implements EventSubscriberInterface\n/** @var Widgets */\nprivate $widgets;\n- public function __construct(Widgets $widgets)\n+ /** @var Canonical */\n+ private $canonical;\n+\n+ public function __construct(Widgets $widgets, Canonical $canonical)\n{\n$this->widgets = $widgets;\n+ $this->canonical = $canonical;\n}\n/**\n@@ -31,7 +36,7 @@ class WidgetSubscriber implements EventSubscriberInterface\n*/\npublic function onKernelRequest(RequestEvent $event): void\n{\n- $this->widgets->registerWidget(new CanonicalLinkWidget());\n+ $this->widgets->registerWidget(new CanonicalLinkWidget($this->canonical));\n$this->widgets->registerWidget(new BoltHeaderWidget());\n$metaTagSnippet = new SnippetWidget(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Widget/CanonicalLinkWidget.php",
"new_path": "src/Widget/CanonicalLinkWidget.php",
"diff": "@@ -4,13 +4,27 @@ declare(strict_types=1);\nnamespace Bolt\\Widget;\n+use Bolt\\Canonical;\nuse Bolt\\Widget\\Injector\\RequestZone;\nuse Bolt\\Widget\\Injector\\Target;\nclass CanonicalLinkWidget extends BaseWidget\n{\nprotected $name = 'Canonical Link';\n- protected $target = Target::NOWHERE;\n- protected $zone = RequestZone::NOWHERE;\n+ protected $target = Target::END_OF_HEAD;\n+ protected $zone = RequestZone::FRONTEND;\nprotected $priority = 200;\n+\n+ /** @var Canonical */\n+ private $canonical;\n+\n+ public function __construct(Canonical $canonical)\n+ {\n+ $this->canonical = $canonical;\n+ }\n+\n+ protected function run(array $params = []): ?string\n+ {\n+ return sprintf('<link rel=\"canonical\" href=\"%s\">', $this->canonical->get());\n+ }\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Adding canonical to all frontend pages.
|
95,144 |
03.12.2019 17:56:44
| -3,600 |
ea15108c64bc4a2971180ed7e22050f66eab7da2
|
Don't set canonical for 404 pages
|
[
{
"change_type": "MODIFY",
"old_path": "src/Canonical.php",
"new_path": "src/Canonical.php",
"diff": "@@ -140,7 +140,9 @@ class Canonical\npublic function setPath(?string $route = null, array $params = []): void\n{\n- if (! $route) {\n+ if (!$this->request->attributes->get('_route')) {\n+ return;\n+ } elseif (! $route) {\n$route = $this->request->attributes->get('_route');\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Don't set canonical for 404 pages
|
95,144 |
04.12.2019 10:23:31
| -3,600 |
11f7871d8c49a03da9dcd33a03215986961eabc0
|
Add newline to injected snippets.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Widget/Injector/HtmlInjector.php",
"new_path": "src/Widget/Injector/HtmlInjector.php",
"diff": "@@ -64,7 +64,7 @@ class HtmlInjector\n}\n// Invoke the (snippet)Widget\n- $snippet = $widget();\n+ $snippet = $widget() . \"\\n\";\n// If the widget doesn't produce output, there's no need to inject it.\nif (empty($snippet)) {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add newline to injected snippets.
|
95,144 |
04.12.2019 12:02:34
| -3,600 |
18cfdfab15418b8e9f7c9bc0c8934d1bb5ec72ff
|
Make `htmllang()` work
|
[
{
"change_type": "MODIFY",
"old_path": "src/Twig/LocaleExtension.php",
"new_path": "src/Twig/LocaleExtension.php",
"diff": "@@ -51,21 +51,19 @@ class LocaleExtension extends AbstractExtension\n$env = ['needs_environment' => true];\nreturn [\n- new TwigFunction('__', [$this, 'translate'], [\n- 'is_safe' => ['html'],\n- ]),\n- new TwigFunction('htmllang', [$this, 'dummy'], [\n- 'is_safe' => ['html'],\n- ]),\n+ new TwigFunction('__', [$this, 'translate'], $safe),\n+ new TwigFunction('htmllang', [$this, 'getHtmlLang'], $env),\nnew TwigFunction('locales', [$this, 'getLocales'], $env),\nnew TwigFunction('locale', [$this, 'getLocale']),\nnew TwigFunction('flag', [$this, 'flag'], $safe),\n];\n}\n- public function dummy($input = null)\n+ public function getHtmlLang(Environment $twig)\n{\n- return $input;\n+ $locales = $this->localeHelper->getLocales($twig);\n+\n+ return $locales->firstWhere('current', true)->get('code');\n}\npublic function translate(string $id, array $parameters = [], $domain = null, $locale = null): string\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make `htmllang()` work
|
95,144 |
04.12.2019 21:19:19
| -3,600 |
e491a46e70f0bc0f4f682f786a5ecc9944ef6244
|
No Edit / Delete / Status links if there is no logged in user
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/ContentExtrasTrait.php",
"new_path": "src/Entity/ContentExtrasTrait.php",
"diff": "@@ -32,7 +32,7 @@ trait ContentExtrasTrait\n/** @var Content $content */\n$content = $this;\n- return [\n+ return array_filter([\n'title' => $this->contentExtension->getTitle($content),\n'image' => $this->contentExtension->getImage($content, true),\n'excerpt' => $this->contentExtension->getExcerpt($content),\n@@ -44,6 +44,6 @@ trait ContentExtrasTrait\n'icon' => $this->getIcon(),\n'name' => $this->getDefinition()->get('name'),\n'singular_name' => $this->getDefinition()->get('singular_name'),\n- ];\n+ ]);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/ContentExtension.php",
"new_path": "src/Twig/ContentExtension.php",
"diff": "@@ -12,6 +12,7 @@ use Bolt\\Utils\\Excerpt;\nuse Bolt\\Utils\\Html;\nuse Symfony\\Component\\Routing\\Exception\\InvalidParameterException;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n+use Symfony\\Component\\Security\\Core\\Security;\nuse Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Extension\\AbstractExtension;\n@@ -30,11 +31,15 @@ class ContentExtension extends AbstractExtension\n/** @var CsrfTokenManagerInterface */\nprivate $csrfTokenManager;\n- public function __construct(UrlGeneratorInterface $urlGenerator, ContentRepository $contentRepository, CsrfTokenManagerInterface $csrfTokenManager)\n+ /** @var Security */\n+ private $security;\n+\n+ public function __construct(UrlGeneratorInterface $urlGenerator, ContentRepository $contentRepository, CsrfTokenManagerInterface $csrfTokenManager, Security $security)\n{\n$this->urlGenerator = $urlGenerator;\n$this->contentRepository = $contentRepository;\n$this->csrfTokenManager = $csrfTokenManager;\n+ $this->security = $security;\n}\n/**\n@@ -221,7 +226,7 @@ class ContentExtension extends AbstractExtension\npublic function getEditLink(Content $content, bool $absolute = false): ?string\n{\n- if ($content->getId() === null) {\n+ if ($content->getId() === null || ! $this->security->getUser()) {\nreturn null;\n}\n@@ -230,7 +235,7 @@ class ContentExtension extends AbstractExtension\npublic function getDeleteLink(Content $content, bool $absolute = false): ?string\n{\n- if ($content->getId() === null) {\n+ if ($content->getId() === null || ! $this->security->getUser()) {\nreturn null;\n}\n@@ -244,7 +249,7 @@ class ContentExtension extends AbstractExtension\npublic function getDuplicateLink(Content $content, bool $absolute = false): ?string\n{\n- if ($content->getId() === null) {\n+ if ($content->getId() === null || ! $this->security->getUser()) {\nreturn null;\n}\n@@ -253,7 +258,7 @@ class ContentExtension extends AbstractExtension\npublic function getStatusLink(Content $content, bool $absolute = false): ?string\n{\n- if ($content->getId() === null) {\n+ if ($content->getId() === null || ! $this->security->getUser()) {\nreturn null;\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
No Edit / Delete / Status links if there is no logged in user
|
95,144 |
04.12.2019 21:20:36
| -3,600 |
0d4845574746638ce27a6d293c68a0f66486dcdf
|
Allow passing in route into Canonical
|
[
{
"change_type": "MODIFY",
"old_path": "src/Canonical.php",
"new_path": "src/Canonical.php",
"diff": "@@ -63,13 +63,17 @@ class Canonical\n$this->setPort($configUrl['port'] ?? null);\n}\n- public function get(): ?string\n+ public function get(?string $route = null, array $params = []): ?string\n{\n// Ensure request has been matched\nif (! $this->request->attributes->get('_route')) {\nreturn null;\n}\n+ if ($route) {\n+ $this->setPath($route, $params);\n+ }\n+\nreturn sprintf(\n'%s://%s%s%s',\n$this->getScheme(),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Twig/HtmlExtension.php",
"new_path": "src/Twig/HtmlExtension.php",
"diff": "@@ -56,9 +56,9 @@ class HtmlExtension extends AbstractExtension\n];\n}\n- public function canonical()\n+ public function canonical(?string $route = null, array $params = [])\n{\n- return $this->canonical->get();\n+ return $this->canonical->get($route, $params);\n}\n/**\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Allow passing in route into Canonical
|
95,144 |
05.12.2019 06:23:42
| -3,600 |
08c6534ebfc600ba188d4b3ee4fe96b7973c9148
|
De-duplicate Locales array
|
[
{
"change_type": "MODIFY",
"old_path": "src/Utils/LocaleHelper.php",
"new_path": "src/Utils/LocaleHelper.php",
"diff": "@@ -86,7 +86,7 @@ class LocaleHelper\n$locales = array_merge($locales, $contentType->get('locales')->all());\n}\n- return $locales;\n+ return array_unique($locales);\n}\nprivate function getLink(string $route, array $routeParams, Collection $locale): string\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
De-duplicate Locales array
|
95,144 |
14.12.2019 10:18:26
| -3,600 |
01bf8b1c77376f0235e712c69ac153dbeb3c0317
|
Add `onDelete="CASCADE"` for Relations, to delete them properly.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Relation.php",
"new_path": "src/Entity/Relation.php",
"diff": "@@ -38,7 +38,7 @@ class Relation\n/**\n* @ORM\\ManyToOne(targetEntity=\"Content\", fetch=\"EAGER\")\n- * @ORM\\JoinColumn(nullable=false)\n+ * @ORM\\JoinColumn(nullable=false,onDelete=\"CASCADE\")\n*\n* @var Content\n* @Groups(\"get_relation\")\n@@ -47,7 +47,7 @@ class Relation\n/**\n* @ORM\\ManyToOne(targetEntity=\"Content\", fetch=\"EAGER\")\n- * @ORM\\JoinColumn(nullable=false)\n+ * @ORM\\JoinColumn(nullable=false,onDelete=\"CASCADE\")\n*\n* @var Content\n* @Groups(\"get_relation\")\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add `onDelete="CASCADE"` for Relations, to delete them properly.
|
95,144 |
14.12.2019 10:45:58
| -3,600 |
cc17cebb034c936917f6d7a66a6a963829991484
|
Don't break on existing records without sets.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/SetField.php",
"new_path": "src/Entity/Field/SetField.php",
"diff": "@@ -34,6 +34,11 @@ class SetField extends Field implements FieldInterface\n$result = [];\n$i = 0;\n+ // If there's no current $fieldDefinitions, we can return early\n+ if (! is_iterable($fieldDefinitions)) {\n+ return $result;\n+ }\n+\nforeach ($fieldDefinitions as $fieldName => $fieldDefinition) {\n$currentSetFieldName = $hash . '::' . $fieldName;\nif ($this->getContent() && $this->getContent()->hasField($currentSetFieldName)) {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Don't break on existing records without sets.
|
95,144 |
14.12.2019 11:14:56
| -3,600 |
47ec151d5bb6f807782c11ac4b076c32e8dcd99b
|
Make sure Content factory has an (empty) fields
|
[
{
"change_type": "MODIFY",
"old_path": "src/Configuration/Content/ContentType.php",
"new_path": "src/Configuration/Content/ContentType.php",
"diff": "@@ -39,6 +39,7 @@ class ContentType extends DeepCollection\n'singular_slug' => $name,\n'singular_name' => $name,\n'locales' => [],\n+ 'fields' => new Collection(),\n]);\n}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make sure Content factory has an (empty) fields
|
95,144 |
14.12.2019 12:48:50
| -3,600 |
dde9f8b0c89f1d4244ba544f8da8efba439f3fe8
|
Ensure Canonical is string
|
[
{
"change_type": "MODIFY",
"old_path": "src/Canonical.php",
"new_path": "src/Canonical.php",
"diff": "@@ -50,7 +50,7 @@ class Canonical\n$requestUrl = parse_url($this->request->getSchemeAndHttpHost());\n- $configCanonical = $this->config->get('general/canonical', $this->request->getSchemeAndHttpHost());\n+ $configCanonical = (string) $this->config->get('general/canonical', $this->request->getSchemeAndHttpHost());\nif (mb_strpos($configCanonical, 'http') !== 0) {\n$configCanonical = $requestUrl['scheme'] . '://' . $configCanonical;\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Ensure Canonical is string
|
95,144 |
14.12.2019 14:09:33
| -3,600 |
b2c14682d4086490746f5b56b37dbf0361ee28af
|
Show the row, even if no image is present
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/listing/Components/Table/Row/index.vue",
"new_path": "assets/js/app/listing/Components/Table/Row/index.vue",
"diff": ">\n<!-- column thumbnail -->\n<div\n- v-if=\"size === 'normal' && record.extras.image !== null\"\n+ v-if=\"size === 'normal' && record.extras.image\"\nclass=\"listing__row--item is-thumbnail\"\n:style=\"`background-image: url('${record.extras.image.thumbnail}')`\"\n></div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Show the row, even if no image is present
|
95,144 |
14.12.2019 15:23:12
| -3,600 |
413491cbe8e20fc1f85d70e89d5621830357e1ca
|
Show all locales in user selection
|
[
{
"change_type": "MODIFY",
"old_path": "templates/users/edit.html.twig",
"new_path": "templates/users/edit.html.twig",
"diff": "{% set localeOptions = [] %}\n- {% for locale in locales() %}\n+ {% for locale in locales(all = true) %}\n{% set localeOptions = localeOptions|merge([\n{\n'key': locale.code,\n- 'value': locale.name ~ ' (' ~ locale.localizedname ~ ', ' ~ locale.code ~ ')'\n+ 'value': locale.emoji ~ ' ' ~ locale.name ~ ' (' ~ locale.localizedname ~ ', ' ~ locale.code ~ ')'\n}\n]) %}\n{% endfor %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Show all locales in user selection
|
95,144 |
18.12.2019 12:45:06
| -3,600 |
4ea7e42f6e29f3ef8577fd35984f5ec44cf0d5cf
|
Sanitize Search text input
|
[
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/SearchController.php",
"new_path": "src/Controller/Frontend/SearchController.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Controller\\Frontend;\nuse Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Repository\\ContentRepository;\nuse Bolt\\TemplateChooser;\n+use Bolt\\Utils\\Sanitiser;\nuse Pagerfanta\\Adapter\\ArrayAdapter;\nuse Pagerfanta\\Pagerfanta;\nuse Symfony\\Component\\HttpFoundation\\Request;\n@@ -18,9 +19,13 @@ class SearchController extends TwigAwareController implements FrontendZone\n/** @var TemplateChooser */\nprivate $templateChooser;\n- public function __construct(TemplateChooser $templateChooser)\n+ /** @var Sanitiser */\n+ private $sanitiser;\n+\n+ public function __construct(TemplateChooser $templateChooser, Sanitiser $sanitiser)\n{\n$this->templateChooser = $templateChooser;\n+ $this->sanitiser = $sanitiser;\n}\n/**\n@@ -31,6 +36,7 @@ class SearchController extends TwigAwareController implements FrontendZone\n{\n$page = (int) $request->query->get('page', 1);\n$searchTerm = $request->get('searchTerm', $request->get('search', $request->get('q', '')));\n+ $searchTerm = $this->sanitiser->clean($searchTerm);\n$amountPerPage = $this->config->get('general/listing_records');\n// @todo implement actual Search Engine\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Sanitize Search text input
|
95,144 |
22.12.2019 15:28:25
| -3,600 |
e09b692a4281b03c4e49b7059e4aaaf59c5ec06c
|
Fine-tuning style / markup for Collections
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Collection.vue",
"new_path": "assets/js/app/editor/Components/Collection.vue",
"diff": "type=\"button\"\n@click=\"addCollectionItem\"\n>\n+ <i class=\"fas fa-fw fa-plus\"></i>\n{{ labels.add_collection_item }}\n</button>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/editor/_forms.scss",
"new_path": "assets/scss/modules/editor/_forms.scss",
"diff": "padding-left: 1rem;\n}\n-.form-fieldset {\n- border-left: 0.5rem solid #ddd;\n+.form-collection {\n+ border-left: 0.35rem solid #ddd;\n+ padding-left: 1rem;\n+}\n+\n+.form-set {\n+ border-left: 0.25rem solid #d8d8d8;\npadding-left: 1rem;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "}\n},\n\"@babel/core\": {\n- \"version\": \"7.7.5\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/core/-/core-7.7.5.tgz\",\n- \"integrity\": \"sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz\",\n+ \"integrity\": \"sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/code-frame\": \"^7.5.5\",\n- \"@babel/generator\": \"^7.7.4\",\n+ \"@babel/generator\": \"^7.7.7\",\n\"@babel/helpers\": \"^7.7.4\",\n- \"@babel/parser\": \"^7.7.5\",\n+ \"@babel/parser\": \"^7.7.7\",\n\"@babel/template\": \"^7.7.4\",\n\"@babel/traverse\": \"^7.7.4\",\n\"@babel/types\": \"^7.7.4\",\n\"source-map\": \"^0.5.0\"\n},\n\"dependencies\": {\n+ \"@babel/generator\": {\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz\",\n+ \"integrity\": \"sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"@babel/types\": \"^7.7.4\",\n+ \"jsesc\": \"^2.5.1\",\n+ \"lodash\": \"^4.17.13\",\n+ \"source-map\": \"^0.5.0\"\n+ }\n+ },\n\"@babel/parser\": {\n- \"version\": \"7.7.5\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz\",\n- \"integrity\": \"sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz\",\n+ \"integrity\": \"sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==\",\n+ \"dev\": true\n+ },\n+ \"jsesc\": {\n+ \"version\": \"2.5.2\",\n+ \"resolved\": \"https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz\",\n+ \"integrity\": \"sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==\",\n\"dev\": true\n},\n\"json5\": {\n\"dev\": true\n},\n\"regjsparser\": {\n- \"version\": \"0.6.1\",\n- \"resolved\": \"https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.1.tgz\",\n- \"integrity\": \"sha512-7LutE94sz/NKSYegK+/4E77+8DipxF+Qn2Tmu362AcmsF2NYq/wx3+ObvU90TKEhjf7hQoFXo23ajjrXP7eUgg==\",\n+ \"version\": \"0.6.2\",\n+ \"resolved\": \"https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz\",\n+ \"integrity\": \"sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==\",\n\"dev\": true,\n\"requires\": {\n\"jsesc\": \"~0.5.0\"\n}\n},\n\"@babel/plugin-proposal-object-rest-spread\": {\n- \"version\": \"7.7.4\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz\",\n- \"integrity\": \"sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz\",\n+ \"integrity\": \"sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/helper-plugin-utils\": \"^7.0.0\",\n}\n},\n\"@babel/plugin-proposal-unicode-property-regex\": {\n- \"version\": \"7.7.4\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz\",\n- \"integrity\": \"sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz\",\n+ \"integrity\": \"sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/helper-create-regexp-features-plugin\": \"^7.7.4\",\n}\n},\n\"@babel/plugin-transform-dotall-regex\": {\n- \"version\": \"7.7.4\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz\",\n- \"integrity\": \"sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz\",\n+ \"integrity\": \"sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/helper-create-regexp-features-plugin\": \"^7.7.4\",\n}\n},\n\"@babel/plugin-transform-parameters\": {\n- \"version\": \"7.7.4\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz\",\n- \"integrity\": \"sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz\",\n+ \"integrity\": \"sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/helper-call-delegate\": \"^7.7.4\",\n}\n},\n\"@babel/preset-env\": {\n- \"version\": \"7.7.6\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.6.tgz\",\n- \"integrity\": \"sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==\",\n+ \"version\": \"7.7.7\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.7.tgz\",\n+ \"integrity\": \"sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/helper-module-imports\": \"^7.7.4\",\n\"@babel/plugin-proposal-async-generator-functions\": \"^7.7.4\",\n\"@babel/plugin-proposal-dynamic-import\": \"^7.7.4\",\n\"@babel/plugin-proposal-json-strings\": \"^7.7.4\",\n- \"@babel/plugin-proposal-object-rest-spread\": \"^7.7.4\",\n+ \"@babel/plugin-proposal-object-rest-spread\": \"^7.7.7\",\n\"@babel/plugin-proposal-optional-catch-binding\": \"^7.7.4\",\n- \"@babel/plugin-proposal-unicode-property-regex\": \"^7.7.4\",\n+ \"@babel/plugin-proposal-unicode-property-regex\": \"^7.7.7\",\n\"@babel/plugin-syntax-async-generators\": \"^7.7.4\",\n\"@babel/plugin-syntax-dynamic-import\": \"^7.7.4\",\n\"@babel/plugin-syntax-json-strings\": \"^7.7.4\",\n\"@babel/plugin-transform-classes\": \"^7.7.4\",\n\"@babel/plugin-transform-computed-properties\": \"^7.7.4\",\n\"@babel/plugin-transform-destructuring\": \"^7.7.4\",\n- \"@babel/plugin-transform-dotall-regex\": \"^7.7.4\",\n+ \"@babel/plugin-transform-dotall-regex\": \"^7.7.7\",\n\"@babel/plugin-transform-duplicate-keys\": \"^7.7.4\",\n\"@babel/plugin-transform-exponentiation-operator\": \"^7.7.4\",\n\"@babel/plugin-transform-for-of\": \"^7.7.4\",\n\"@babel/plugin-transform-named-capturing-groups-regex\": \"^7.7.4\",\n\"@babel/plugin-transform-new-target\": \"^7.7.4\",\n\"@babel/plugin-transform-object-super\": \"^7.7.4\",\n- \"@babel/plugin-transform-parameters\": \"^7.7.4\",\n+ \"@babel/plugin-transform-parameters\": \"^7.7.7\",\n\"@babel/plugin-transform-property-literals\": \"^7.7.4\",\n\"@babel/plugin-transform-regenerator\": \"^7.7.5\",\n\"@babel/plugin-transform-reserved-words\": \"^7.7.4\",\n\"@babel/plugin-transform-unicode-regex\": \"^7.7.4\",\n\"@babel/types\": \"^7.7.4\",\n\"browserslist\": \"^4.6.0\",\n- \"core-js-compat\": \"^3.4.7\",\n+ \"core-js-compat\": \"^3.6.0\",\n\"invariant\": \"^2.2.2\",\n\"js-levenshtein\": \"^1.1.3\",\n\"semver\": \"^5.5.0\"\n\"integrity\": \"sha1-aN/1++YMUes3cl6p4+0xDcwed24=\"\n},\n\"bootbox\": {\n- \"version\": \"5.3.4\",\n- \"resolved\": \"https://registry.npmjs.org/bootbox/-/bootbox-5.3.4.tgz\",\n- \"integrity\": \"sha512-odUj3HCaIfaSltAyfCRuPavruQKvpluTihyCbJ1bvRdAi7P2/bEbcjWMkTSonaHC+QjnrQfO1Px6863fJ13//A==\",\n+ \"version\": \"5.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/bootbox/-/bootbox-5.4.0.tgz\",\n+ \"integrity\": \"sha512-GCPrDwZpJsUnqzrto3ZURVafypl13+DAyE3YZx5jR5EIoTDSyREPhr77hlCuPKvM6VvXR5Mh/34W3DYMC7JE9g==\",\n\"requires\": {\n- \"bootstrap\": \">=3.0.0\",\n- \"jquery\": \">=1.12.0\",\n- \"popper.js\": \">=1.12.9\"\n+ \"bootstrap\": \"^4.4.0\",\n+ \"jquery\": \"^3.4.1\",\n+ \"popper.js\": \"^1.16.0\"\n}\n},\n\"bootstrap\": {\n\"integrity\": \"sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=\"\n},\n\"codemirror\": {\n- \"version\": \"5.49.2\",\n- \"resolved\": \"https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz\",\n- \"integrity\": \"sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ==\"\n+ \"version\": \"5.50.0\",\n+ \"resolved\": \"https://registry.npmjs.org/codemirror/-/codemirror-5.50.0.tgz\",\n+ \"integrity\": \"sha512-32LAmGcBNhKtJP4WGgkcaCVQDyChAyaWA6jasg778ziZzo3PWBuhpAQIJMO8//Id45RoaLyXjuhcRUBoS8Vg+Q==\"\n},\n\"codemirror-spell-checker\": {\n\"version\": \"1.1.2\",\n\"dev\": true\n},\n\"core-js-compat\": {\n- \"version\": \"3.5.0\",\n- \"resolved\": \"https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.5.0.tgz\",\n- \"integrity\": \"sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==\",\n+ \"version\": \"3.6.0\",\n+ \"resolved\": \"https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.0.tgz\",\n+ \"integrity\": \"sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==\",\n\"dev\": true,\n\"requires\": {\n\"browserslist\": \"^4.8.2\",\n- \"semver\": \"^6.3.0\"\n+ \"semver\": \"7.0.0\"\n},\n\"dependencies\": {\n\"browserslist\": {\n}\n},\n\"caniuse-lite\": {\n- \"version\": \"1.0.30001015\",\n- \"resolved\": \"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz\",\n- \"integrity\": \"sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==\",\n+ \"version\": \"1.0.30001016\",\n+ \"resolved\": \"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz\",\n+ \"integrity\": \"sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==\",\n\"dev\": true\n},\n\"electron-to-chromium\": {\n\"dev\": true\n},\n\"node-releases\": {\n- \"version\": \"1.1.42\",\n- \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.42.tgz\",\n- \"integrity\": \"sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==\",\n+ \"version\": \"1.1.43\",\n+ \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.43.tgz\",\n+ \"integrity\": \"sha512-Rmfnj52WNhvr83MvuAWHEqXVoZXCcDQssSOffU4n4XOL9sPrP61mSZ88g25NqmABDvH7PiAlFCzoSCSdzA293w==\",\n\"dev\": true,\n\"requires\": {\n\"semver\": \"^6.3.0\"\n+ },\n+ \"dependencies\": {\n+ \"semver\": {\n+ \"version\": \"6.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-6.3.0.tgz\",\n+ \"integrity\": \"sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\",\n+ \"dev\": true\n}\n}\n+ },\n+ \"semver\": {\n+ \"version\": \"7.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-7.0.0.tgz\",\n+ \"integrity\": \"sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==\",\n+ \"dev\": true\n+ }\n}\n},\n\"core-util-is\": {\n}\n},\n\"eslint\": {\n- \"version\": \"6.7.2\",\n- \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz\",\n- \"integrity\": \"sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==\",\n+ \"version\": \"6.8.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz\",\n+ \"integrity\": \"sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==\",\n\"dev\": true,\n\"requires\": {\n\"@babel/code-frame\": \"^7.0.0\",\n}\n},\n\"eslint-plugin-prettier\": {\n- \"version\": \"3.1.1\",\n- \"resolved\": \"https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz\",\n- \"integrity\": \"sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==\",\n+ \"version\": \"3.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz\",\n+ \"integrity\": \"sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==\",\n\"dev\": true,\n\"requires\": {\n\"prettier-linter-helpers\": \"^1.0.0\"\n\"dev\": true\n},\n\"inquirer\": {\n- \"version\": \"7.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz\",\n- \"integrity\": \"sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==\",\n+ \"version\": \"7.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz\",\n+ \"integrity\": \"sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==\",\n\"dev\": true,\n\"requires\": {\n\"ansi-escapes\": \"^4.2.1\",\n\"lodash\": \"^4.17.15\",\n\"mute-stream\": \"0.0.8\",\n\"run-async\": \"^2.2.0\",\n- \"rxjs\": \"^6.4.0\",\n+ \"rxjs\": \"^6.5.3\",\n\"string-width\": \"^4.1.0\",\n\"strip-ansi\": \"^5.1.0\",\n\"through\": \"^2.3.6\"\n}\n},\n\"terser\": {\n- \"version\": \"4.4.2\",\n- \"resolved\": \"https://registry.npmjs.org/terser/-/terser-4.4.2.tgz\",\n- \"integrity\": \"sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==\",\n+ \"version\": \"4.4.3\",\n+ \"resolved\": \"https://registry.npmjs.org/terser/-/terser-4.4.3.tgz\",\n+ \"integrity\": \"sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==\",\n\"requires\": {\n\"commander\": \"^2.20.0\",\n\"source-map\": \"~0.6.1\",\n}\n},\n\"vue-loader\": {\n- \"version\": \"15.7.2\",\n- \"resolved\": \"https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.2.tgz\",\n- \"integrity\": \"sha512-H/P9xt/nkocyu4hZKg5TzPqyCT1oKOaCSk9zs0JCbJuy0Q8KtR0bjJpnT/5R5x/Ckd1GFkkLQnQ1C4x6xXeLZg==\",\n+ \"version\": \"15.8.3\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-loader/-/vue-loader-15.8.3.tgz\",\n+ \"integrity\": \"sha512-yFksTFbhp+lxlm92DrKdpVIWMpranXnTEuGSc0oW+Gk43M9LWaAmBTnfj5+FCdve715mTHvo78IdaXf5TbiTJg==\",\n\"requires\": {\n- \"@vue/component-compiler-utils\": \"^3.0.0\",\n+ \"@vue/component-compiler-utils\": \"^3.1.0\",\n\"hash-sum\": \"^1.0.2\",\n\"loader-utils\": \"^1.1.0\",\n\"vue-hot-reload-api\": \"^2.3.0\",\n\"vue-style-loader\": \"^4.1.0\"\n+ },\n+ \"dependencies\": {\n+ \"@vue/component-compiler-utils\": {\n+ \"version\": \"3.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.0.tgz\",\n+ \"integrity\": \"sha512-OJ7swvl8LtKtX5aYP8jHhO6fQBIRIGkU6rvWzK+CGJiNOnvg16nzcBkd9qMZzW8trI2AsqAKx263nv7kb5rhZw==\",\n+ \"requires\": {\n+ \"consolidate\": \"^0.15.1\",\n+ \"hash-sum\": \"^1.0.2\",\n+ \"lru-cache\": \"^4.1.2\",\n+ \"merge-source-map\": \"^1.1.0\",\n+ \"postcss\": \"^7.0.14\",\n+ \"postcss-selector-parser\": \"^5.0.0\",\n+ \"prettier\": \"^1.18.2\",\n+ \"source-map\": \"~0.6.1\",\n+ \"vue-template-es2015-compiler\": \"^1.9.0\"\n+ }\n+ },\n+ \"lru-cache\": {\n+ \"version\": \"4.1.5\",\n+ \"resolved\": \"https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz\",\n+ \"integrity\": \"sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==\",\n+ \"requires\": {\n+ \"pseudomap\": \"^1.0.2\",\n+ \"yallist\": \"^2.1.2\"\n+ }\n+ },\n+ \"yallist\": {\n+ \"version\": \"2.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz\",\n+ \"integrity\": \"sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=\"\n+ }\n}\n},\n\"vue-multiselect\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"@vue/cli-service\": \"^3.12.1\",\n\"axios\": \"^0.19.0\",\n\"baguettebox.js\": \"^1.11.0\",\n- \"bootbox\": \"^5.3.4\",\n+ \"bootbox\": \"^5.4.0\",\n\"bootstrap\": \"^4.4.1\",\n- \"codemirror\": \"^5.49.2\",\n+ \"codemirror\": \"^5.50.0\",\n\"dropzone\": \"^5.5.1\",\n\"flagpack\": \"^1.0.4\",\n\"jquery\": \"^3.4.1\",\n\"simplemde\": \"^1.11.2\",\n\"stylelint-config-recommended-scss\": \"^4.1\",\n\"stylelint-scss\": \"^3.13\",\n- \"terser\": \"^4.4.2\",\n+ \"terser\": \"^4.4.3\",\n\"tinycolor2\": \"^1.4.1\",\n\"vue\": \"^2.6.11\",\n\"vue-flatpickr-component\": \"^8.1.5\",\n\"zxcvbn\": \"^4.4.2\"\n},\n\"devDependencies\": {\n- \"@babel/core\": \"^7.7.5\",\n+ \"@babel/core\": \"^7.7.7\",\n\"@babel/plugin-transform-regenerator\": \"^7.7.5\",\n\"@babel/plugin-transform-runtime\": \"^7.7.6\",\n\"@babel/polyfill\": \"^7.7.0\",\n- \"@babel/preset-env\": \"^7.7.6\",\n+ \"@babel/preset-env\": \"^7.7.7\",\n\"@fortawesome/fontawesome-free\": \"^5.12.0\",\n\"@symfony/webpack-encore\": \"^0.28.2\",\n\"@vue/test-utils\": \"^1.0.0-beta.30\",\n\"babel-core\": \"^7.0.0-bridge.0\",\n\"babel-eslint\": \"^10.0.3\",\n\"babel-jest\": \"^24.9.0\",\n- \"eslint\": \"^6.7.2\",\n+ \"eslint\": \"^6.8.0\",\n\"eslint-config-prettier\": \"^6.7.0\",\n- \"eslint-plugin-prettier\": \"^3.1.1\",\n+ \"eslint-plugin-prettier\": \"^3.1.2\",\n\"eslint-plugin-standard\": \"^4.0.1\",\n\"eslint-plugin-vue\": \"^6.0.1\",\n\"jest\": \"^24.9.0\",\n\"stylelint\": \"^11.1.1\",\n\"stylelint-config-standard\": \"^19.0.0\",\n\"vue-jest\": \"^3.0.5\",\n- \"vue-loader\": \"^15.7.2\",\n+ \"vue-loader\": \"^15.8.3\",\n\"vue-router\": \"^3.1.3\",\n\"vue-template-compiler\": \"^2.6.11\",\n\"webpackbar\": \"^4.0.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_macro/_macro.html.twig",
"new_path": "templates/_macro/_macro.html.twig",
"diff": "{% endif %}\n{% set new_field %}\n- {% include '@bolt/_partials/fields/' ~ item_field.type ~ '.html.twig' with\n- {'field': item_field, 'in_collection': true, 'is_first': loop.index0 == 0, 'is_last': loop.index == fields|length, 'name': collectionItemName, 'collection_name': collectionField.name, 'hash': hash } only %}\n+ {% set context = {\n+ 'field': item_field,\n+ 'in_collection': true,\n+ 'is_first': loop.index0 == 0,\n+ 'is_last': loop.index == fields|length,\n+ 'name': collectionItemName,\n+ 'collection_name': collectionField.name,\n+ 'collection_label': collectionField.definition.label,\n+ 'hash': hash\n+ } %}\n+ {% include '@bolt/_partials/fields/' ~ item_field.type ~ '.html.twig' with context only %}\n{% endset %}\n{# set the label manually as set in _base.html.twig, to pass to Collection.vue for templates #}\n{% set label = item_field.definition.label|default(item_field.name|default('unnamed')|ucwords) %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_base.html.twig",
"new_path": "templates/_partials/fields/_base.html.twig",
"diff": "{# Set type #}\n{% set type = field.type|default %}\n-{% if type in ['imagelist', 'filelist', 'collection'] %}\n- {% set fieldset = true %}\n-{% else %}\n- {% set fieldset = false %}\n-{% endif %}\n+{% set type_collection = (type in ['collection']) %}\n+{% set type_set = (type in ['imagelist', 'filelist', 'set']) %}\n{# Set variant #}\n{% set variant = field.definition.variant|default('normal') %}\n{%- endapply -%}\n<!-- field \"{{ label }}\" (type: {{ type }}{% if variant != 'normal' %}, variant: {{ variant }}{% endif %}) -->\n-<div class=\"form-group {{ fieldset ? 'form-fieldset' }} is-{{ variant }}\">\n+<div class=\"form-group {{ type_set ? 'form-set' }} {{ type_collection ? 'form-collection' }} is-{{ variant }}\">\n{{ prefix|raw }}\n{% block label %}\n{% include '@bolt/_partials/fields/_label.html.twig' %}\n+ {% include '@bolt/_partials/fields/_collection_buttons.html.twig' %}\n{% endblock %}\n{% block field %}\n{{ postfix|raw }}\n-{% if in_collection is defined %}\n- <input type=\"hidden\" name=\"collections[{{ collection_name }}][order][]\" value=\"{{ hash }}\">\n-\n- <button class='action-move-up-collection-item btn btn-secondary' {% if is_first is defined and is_first %} disabled {% endif %}>\n- <i class=\"fas fa-fw fa-chevron-up\"></i>\n- {{ 'collection.move_item_up'|trans }}\n- </button>\n- <button class='action-move-down-collection-item btn btn-secondary' {% if is_last is defined and is_last %} disabled {% endif %}>\n- <i class=\"fas fa-fw fa-chevron-down\"></i>\n- {{ 'collection.move_item_down'|trans }}\n- </button>\n- <button class='action-remove-collection-item btn btn-hidden-danger'>\n- <i class=\"fas fa-fw fa-times\"></i>\n- {{ 'collection.remove_item'|trans }}\n- </button>\n-{% endif %}\n</div>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/_partials/fields/_collection_buttons.html.twig",
"diff": "+{% if in_collection is defined %}\n+ <div class=\"float-right\" role=\"group\" aria-label=\"Collection buttons\">\n+ <input type=\"hidden\" name=\"collections[{{ collection_name }}][order][]\" value=\"{{ hash }}\">\n+\n+ <button class='action-move-up-collection-item btn btn-secondary btn-sm' {% if is_first is defined and is_first %} disabled {% endif %}>\n+ <i class=\"fas fa-fw fa-chevron-up\"></i>\n+ {{ 'collection.move_item_up'|trans }}\n+ </button>\n+ <button class='action-move-down-collection-item btn btn-secondary btn-sm' {% if is_last is defined and is_last %} disabled {% endif %}>\n+ <i class=\"fas fa-fw fa-chevron-down\"></i>\n+ {{ 'collection.move_item_down'|trans }}\n+ </button>\n+ <button class='action-remove-collection-item btn btn-hidden-danger btn-sm'>\n+ <i class=\"fas fa-fw fa-trash\"></i>\n+ {{ 'collection.remove_item'|trans }}\n+ </button>\n+ </div>\n+{% endif %}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_label.html.twig",
"new_path": "templates/_partials/fields/_label.html.twig",
"diff": "-{%- if type != 'checkbox' -%}\n+{%- if type not in ['checkbox', 'collection'] -%}\n<label for=\"{{ id }}\">\n{%- if localize -%}\n<i class=\"fas fa-language\"></i>\n{%- endif -%}\n- {{- label -}}\n-\n- {%- if type != 'checkbox' -%}\n- {{- ':' -}}\n- {%- endif -%}\n+ {% if in_collection is defined %}\n+ <span style=\"font-weight: normal;\">{{ collection_label }} »</span>\n+ {% endif %}\n+ {{- label -}}:\n</label>\n{%- endif -%}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/collection.html.twig",
"new_path": "templates/_partials/fields/collection.html.twig",
"diff": "{% block field %}\n{% set labels = {\n- 'add_collection_item': 'collection.add_item'|trans\n+ 'add_collection_item': 'collection.add_item'|trans({'%name%': field.definition.label}),\n} %}\n{# get the html for all collection field already in the database #}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<unit id=\"0C9.Vmh\" name=\"collection.add_item\">\n<segment>\n<source>collection.add_item</source>\n- <target>Add item</target>\n+ <target>Add item to %name%</target>\n</segment>\n</unit>\n<unit id=\"ApPu4P_\" name=\"collection.move_item_up\">\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.nl.xlf",
"new_path": "translations/messages.nl.xlf",
"diff": "<target>Geen zoekresultaten voor '%search%'.</target>\n</segment>\n</unit>\n+ <unit id=\"0C9.Vmh\" name=\"collection.add_item\">\n+ <segment>\n+ <source>collection.add_item</source>\n+ <target>Voeg toe aan %name%</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"ApPu4P_\" name=\"collection.move_item_up\">\n+ <segment>\n+ <source>collection.move_item_up</source>\n+ <target>Omhoog</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"KzBtfHi\" name=\"collection.move_item_down\">\n+ <segment>\n+ <source>collection.move_item_down</source>\n+ <target>Omlaag</target>\n+ </segment>\n+ </unit>\n+ <unit id=\".t1ICS7\" name=\"collection.remove_item\">\n+ <segment>\n+ <source>collection.remove_item</source>\n+ <target>Verwijder</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fine-tuning style / markup for Collections
|
95,144 |
23.12.2019 12:59:10
| -3,600 |
d97fb7765ad5c96d1d58866014b63bff6c10bda8
|
Update _label.html.twig
|
[
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_label.html.twig",
"new_path": "templates/_partials/fields/_label.html.twig",
"diff": "-{%- if type not in ['checkbox', 'collection'] -%}\n- <label for=\"{{ id }}\">\n+{%- if type != 'checkbox' -%}\n+ <label for=\"{{ id }}\" {% if type == 'collection' %}class=\"sr-only\"{% endif %}>\n{%- if localize -%}\n<i class=\"fas fa-language\"></i>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update _label.html.twig
|
95,144 |
23.12.2019 20:28:44
| -3,600 |
e2955fe64185a72cd34c734d55ed5895feeae450
|
Tweaking filelist and imagelist
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/File.vue",
"new_path": "assets/js/app/editor/Components/File.vue",
"diff": "</div>\n</transition>\n<div class=\"row\">\n- <div class=\"col-8\">\n+ <div class=\"col-12\">\n<div class=\"input-group mb-3\">\n<input :name=\"name + '[media]'\" type=\"hidden\" :value=\"media\" />\n<input\n<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-secondary\"\ntype=\"button\"\n@click=\"selectUploadFile\"\n>\n<i class=\"fas fa-fw fa-upload\"></i>{{ labels.button_upload }}\n</button>\n- </div>\n- <div class=\"btn-group mr-2\" role=\"group\">\n+\n+ <button class=\"btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split\" aria-expanded=\"false\" aria-haspopup=\"true\"\n+ data-toggle=\"dropdown\" type=\"button\">\n+ </button>\n+\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-secondary dropdown-menu dropdown-menu-right\"\ntype=\"button\"\n@click=\"selectServerFile\"\n>\n- <i class=\"fas fa-fw fa-th\"></i> {{ labels.button_from_library }}\n+ <i class=\"fas fa-fw fa-th mr-2 ml-2\"></i> {{ labels.button_from_library }}\n</button>\n</div>\n+ <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n+ <a\n+ class=\"btn btn-sm btn-secondary\"\n+ :href=\"attributesLink + '?file=' + filename\"\n+ target=\"_blank\"\n+ >\n+ <i class=\"fas fa-fw fa-info-circle\"></i>\n+ {{ labels.button_edit_attributes }}\n+ </a>\n+ </div>\n<div v-if=\"inFilelist == true\" class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n:disabled=\"isFirstInFilelist\"\n@click=\"onMoveFileUp\"\n<i class=\"fas fa-fw fa-chevron-up\"></i>\n{{ labels.button_move_up }}\n</button>\n- </div>\n- <div v-if=\"inFilelist == true\" class=\"btn-group mr-2\" role=\"group\">\n+\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n:disabled=\"isLastInFilelist\"\n@click=\"onMoveFileDown\"\n<i class=\"fas fa-fw fa-chevron-down\"></i>\n{{ labels.button_move_down }}\n</button>\n- </div>\n- <div v-if=\"inFilelist == true\" class=\"btn-group mr-2\" role=\"group\">\n+\n<button\n- class=\"btn btn-hidden-danger\"\n+ class=\"btn btn-sm btn-hidden-danger\"\ntype=\"button\"\n@click=\"onRemoveFile\"\n>\n- <i class=\"fas fa-fw fa-times\"></i> {{ labels.button_remove }}\n+ <i class=\"fas fa-fw fa-trash\"></i> {{ labels.button_remove }}\n</button>\n</div>\n- <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n- <a\n- class=\"btn btn-tertiary\"\n- :href=\"attributesLink + '?file=' + filename\"\n- target=\"_blank\"\n- >\n- <i class=\"fas fa-fw fa-info-circle\"></i>\n- {{ labels.button_edit_attributes }}\n- </a>\n- </div>\n</div>\n<div v-if=\"progress > 0\" class=\"progress mt-3\">\n<div\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Image.vue",
"new_path": "assets/js/app/editor/Components/Image.vue",
"diff": "<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-secondary\"\ntype=\"button\"\n@click=\"selectUploadFile\"\n>\n<i class=\"fas fa-fw fa-upload\"></i>{{ labels.button_upload }}\n</button>\n- </div>\n- <div class=\"btn-group mr-2\" role=\"group\">\n+\n+ <button class=\"btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split\" aria-expanded=\"false\" aria-haspopup=\"true\"\n+ data-toggle=\"dropdown\" type=\"button\">\n+ </button>\n+\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-secondary dropdown-menu dropdown-menu-right\"\ntype=\"button\"\n@click=\"selectServerFile\"\n>\n- <i class=\"fas fa-fw fa-th\"></i> {{ labels.button_from_library }}\n+ <i class=\"fas fa-fw fa-th mr-2 ml-2\"></i> {{ labels.button_from_library }}\n</button>\n</div>\n+\n+ <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n+ <a\n+ class=\"btn btn-sm btn-secondary\"\n+ :href=\"attributesLink + '?file=' + filenameData\"\n+ target=\"_blank\"\n+ >\n+ <i class=\"fas fa-fw fa-info-circle\"></i>\n+ {{ labels.button_edit_attributes }}\n+ </a>\n+ </div>\n+\n<div v-if=\"inImagelist == true\" class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n:disabled=\"isFirstInImagelist\"\n@click=\"onMoveImageUp\"\n<i class=\"fas fa-fw fa-chevron-up\"></i>\n{{ labels.button_move_up }}\n</button>\n- </div>\n- <div v-if=\"inImagelist == true\" class=\"btn-group mr-2\" role=\"group\">\n+\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n:disabled=\"isLastInImagelist\"\n@click=\"onMoveImageDown\"\n<i class=\"fas fa-fw fa-chevron-down\"></i>\n{{ labels.button_move_down }}\n</button>\n- </div>\n- <div v-if=\"inImagelist == true\" class=\"btn-group mr-2\" role=\"group\">\n+\n<button\n- class=\"btn btn-hidden-danger\"\n+ class=\"btn btn-sm btn-hidden-danger\"\ntype=\"button\"\n@click=\"onRemoveImage\"\n>\n- <i class=\"fas fa-fw fa-times\"></i> {{ labels.button_remove }}\n+ <i class=\"fas fa-fw fa-trash\"></i> {{ labels.button_remove }}\n</button>\n</div>\n-\n- <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n- <a\n- class=\"btn btn-tertiary\"\n- :href=\"attributesLink + '?file=' + filenameData\"\n- target=\"_blank\"\n- >\n- <i class=\"fas fa-fw fa-info-circle\"></i>\n- {{ labels.button_edit_attributes }}\n- </a>\n- </div>\n</div>\n<div v-if=\"progress > 0\" class=\"progress mt-3\">\n<div\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/filelist.html.twig",
"new_path": "templates/_partials/fields/filelist.html.twig",
"diff": "'placeholder_alt_text': 'image.placeholder_alt_text'|trans,\n'placeholder_title': 'image.placeholder_title'|trans,\n'button_remove': 'image.button_remove'|trans,\n- 'button_move_up': 'image.button_move_up'|trans,\n- 'button_move_down': 'image.button_move_down'|trans,\n+ 'button_move_up': 'image.button_up'|trans,\n+ 'button_move_down': 'image.button_down'|trans,\n'add_new_file': 'file.add_new_file'|trans,\n'button_edit_attributes': 'image.button_edit_attributes'|trans,\n}|json_encode %}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/imagelist.html.twig",
"new_path": "templates/_partials/fields/imagelist.html.twig",
"diff": "'placeholder_title': 'image.placeholder_title'|trans,\n'button_remove': 'image.button_remove'|trans,\n'button_edit_attributes': 'image.button_edit_attributes'|trans,\n- 'button_move_up': 'image.button_move_up'|trans,\n- 'button_move_down': 'image.button_move_down'|trans,\n+ 'button_move_up': 'image.button_up'|trans,\n+ 'button_move_down': 'image.button_down'|trans,\n'add_new_image': 'image.add_new_image'|trans,\n}|json_encode %}\n{% set extensions = field.definition.get('extensions')|default('') %}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<target>Previous</target>\n</segment>\n</unit>\n+ <unit id=\"7aSD0Qr\" name=\"image.button_up\">\n+ <segment>\n+ <source>image.button_up</source>\n+ <target>Up</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"WihD8Y5\" name=\"image.button_down\">\n+ <segment>\n+ <source>image.button_down</source>\n+ <target>Down</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Tweaking filelist and imagelist
|
95,144 |
24.12.2019 10:57:46
| -3,600 |
3d55bea99404f8876026866be6f4736ec623b229
|
Disable test for now.
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Imagelist.vue",
"new_path": "assets/js/app/editor/Components/Imagelist.vue",
"diff": "<template>\n- <div class=\"editor-imagelist\">\n+ <div class=\"editor__imagelist\">\n<div\nv-for=\"(child, index) in containerImages\"\n:key=\"child.id\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_base.html.twig",
"new_path": "templates/_partials/fields/_base.html.twig",
"diff": "{%- endapply -%}\n<!-- field \"{{ label }}\" (type: {{ type }}{% if variant != 'normal' %}, variant: {{ variant }}{% endif %}) -->\n-<div class=\"form-group {{ type_set ? 'form-set' }} {{ type_collection ? 'form-collection' }} is-{{ variant }}\">\n+<div\n+ class=\"form-group {{ type_set ? 'form-set' }} {{ type_collection ? 'form-collection' }} is-{{ variant }}\"\n+ id=\"field-{{ type }}-{{ field.name|default('unnamed') }}\"\n+>\n{{ prefix|raw }}\n{% block label %}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/behat/edit_record_1.feature",
"new_path": "tests/behat/edit_record_1.feature",
"diff": "@@ -55,7 +55,7 @@ Feature: Edit record\nAnd the \"fields[embed][width]\" field should contain \"480\"\nAnd the \"fields[embed][height]\" field should contain \"270\"\n- @javascript\n+ @javascript-disabled\nScenario: As an Admin I want to fill in an imagelist\nGiven I am logged in as \"admin\"\nWhen I am on \"/bolt/edit/42\"\n@@ -63,8 +63,9 @@ Feature: Edit record\nThen I should see \"Imagelist\" in the \"label[for='field-imagelist']\" element\n#From library button of imagelist\n- And I scroll \"#media > div.form-group.form-set.is-normal > div > div > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(2) > button\" into view\n- When I click \"#media > div.form-group.form-set.is-normal > div > div > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(2) > button\"\n+ When I scroll \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(1) .btn-toolbar > div:nth-child(1) > button:nth-child(1)\" into view\n+ And I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(1) .btn-toolbar > div:nth-child(1) > button:nth-child(2)\"\n+ And I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(1) .btn-toolbar > div:nth-child(1) > button:nth-child(3)\"\nAnd I wait 1 second\nAnd I select \"kitten.jpg\" from \"bootbox-input\"\nAnd I press \"OK\"\n@@ -72,11 +73,12 @@ Feature: Edit record\nAnd I wait 1 second\nWhen I press \"Add new image\"\n- Then I should see 2 \".row\" elements in the \".editor-imagelist\" element\n+ Then I should see 2 \".row\" elements in the \".editor__imagelist\" element\n#Second From library button of imagelist\n- When I scroll \"#media > div.form-group.form-set.is-normal > div > div:nth-child(2) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(2) > button\" into view\n- When I click \"#media > div.form-group.form-set.is-normal > div > div:nth-child(2) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(2) > button\"\n+ When I scroll \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(2) .btn-toolbar > div:nth-child(1) > button:nth-child(1)\" into view\n+ And I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(2) .btn-toolbar > div:nth-child(1) > button:nth-child(2)\"\n+ And I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(2) .btn-toolbar > div:nth-child(1) > button:nth-child(3)\"\nAnd I wait 1 second\nAnd I select \"joey.jpg\" from \"bootbox-input\"\nAnd I press \"OK\"\n@@ -84,23 +86,23 @@ Feature: Edit record\nAnd I wait 1 second\n#click first Move down\n- When I click \"#media > div.form-group.form-set.is-normal > div > div:nth-child(1) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(4) > button\"\n+ When I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(1) .btn-toolbar > div:nth-child(2) > button:nth-child(2)\"\nThen the \"fields[imagelist][0][filename]\" field should contain \"joey.jpg\"\nAnd the \"fields[imagelist][1][filename]\" field should contain \"kitten.jpg\"\n#click second Move up\n- When I click \"#media > div.form-group.form-set.is-normal > div > div:nth-child(2) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(3) > button\"\n+ When I click \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(2) .btn-toolbar > div:nth-child(2) > button:nth-child(1)\"\nThen the \"fields[imagelist][0][filename]\" field should contain \"kitten.jpg\"\nAnd the \"fields[imagelist][1][filename]\" field should contain \"joey.jpg\"\n#first Move up\n- And the \"#media > div.form-group.form-set.is-normal > div > div:nth-child(1) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(3) > button\" button should be disabled\n+ And the \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(1) .btn-toolbar > div:nth-child(2) > button:nth-child(1)\" button should be disabled\n#last Move down\n- And the \"#media > div.form-group.form-set.is-normal > div > div:nth-child(2) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(4) > button\" button should be disabled\n+ And the \"#field-imagelist-imagelist .editor__imagelist .form-fieldsgroup:nth-child(2) .btn-toolbar > div:nth-child(2) > button:nth-child(2)\" button should be disabled\n#first Remove\nWhen I click \"#media > div.form-group.form-set.is-normal > div > div:nth-child(1) > div > div.row > div.col-9 > div.btn-toolbar > div:nth-child(5) > button\"\n- Then I should see 1 \".row\" elements in the \".editor-imagelist\" element\n+ Then I should see 1 \".row\" elements in the \".editor__imagelist\" element\nAnd the \"fields[imagelist][1][filename]\" field should contain \"joey.jpg\"\nWhen I scroll \"#editcontent > div.record-actions > button\" into view\n@@ -113,7 +115,7 @@ Feature: Edit record\nAnd I scroll \"#editcontent > div.record-actions > button\" into view\nAnd I press \"Save changes\"\n- Then I should see 1 \".row\" elements in the \".editor-imagelist\" element\n+ Then I should see 1 \".row\" elements in the \".editor__imagelist\" element\nAnd the \"fields[imagelist][0][filename]\" field should contain \"\"\n@javascript\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Disable test for now.
|
95,144 |
25.12.2019 08:43:18
| -3,600 |
735216630890a8ba8df83c254c1205a8ef9f9d95
|
Fine-tuning a bunch of button styles
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/File.vue",
"new_path": "assets/js/app/editor/Components/File.vue",
"diff": "<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-sm btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n@click=\"selectUploadFile\"\n>\n</button>\n<button\n- class=\"btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split\"\n+ class=\"btn btn-sm btn-tertiary dropdown-toggle dropdown-toggle-split\"\naria-expanded=\"false\"\naria-haspopup=\"true\"\ndata-toggle=\"dropdown\"\ntype=\"button\"\n></button>\n+ <div class=\"dropdown-menu\">\n<button\n- class=\"btn btn-sm btn-secondary dropdown-menu dropdown-menu-right\"\n+ class=\"btn dropdown-item\"\ntype=\"button\"\n@click=\"selectServerFile\"\n>\n- <i class=\"fas fa-fw fa-th mr-2 ml-2\"></i>\n+ <i class=\"fas fa-fw fa-th\"></i>\n{{ labels.button_from_library }}\n</button>\n- </div>\n-\n- <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n<a\n- class=\"btn btn-sm btn-secondary\"\n- :href=\"attributesLink + '?file=' + filename\"\n+ v-if=\"filenameData\"\n+ class=\"dropdown-item\"\n+ :href=\"attributesLink + '?file=' + filenameData\"\ntarget=\"_blank\"\n>\n<i class=\"fas fa-fw fa-info-circle\"></i>\n{{ labels.button_edit_attributes }}\n</a>\n</div>\n+ </div>\n+\n<div v-if=\"inFilelist == true\" class=\"btn-group mr-2\" role=\"group\">\n<button\nclass=\"btn btn-sm btn-tertiary\"\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Filelist.vue",
"new_path": "assets/js/app/editor/Components/Filelist.vue",
"diff": "></editor-file>\n</div>\n- <button class=\"btn btn-secondary\" type=\"button\" @click=\"addFile\">\n+ <button class=\"btn btn-tertiary\" type=\"button\" @click=\"addFile\">\n+ <i class=\"fas fa-fw fa-plus\"></i>\n{{ labels.add_new_file }}\n</button>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Image.vue",
"new_path": "assets/js/app/editor/Components/Image.vue",
"diff": "<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button\n- class=\"btn btn-sm btn-secondary\"\n+ class=\"btn btn-sm btn-tertiary\"\ntype=\"button\"\n@click=\"selectUploadFile\"\n>\n</button>\n<button\n- class=\"btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split\"\n+ class=\"btn btn-sm btn-tertiary dropdown-toggle dropdown-toggle-split\"\naria-expanded=\"false\"\naria-haspopup=\"true\"\ndata-toggle=\"dropdown\"\ntype=\"button\"\n></button>\n+ <div class=\"dropdown-menu\">\n<button\n- class=\"btn btn-sm btn-secondary dropdown-menu dropdown-menu-right\"\n+ class=\"btn dropdown-item\"\ntype=\"button\"\n@click=\"selectServerFile\"\n>\n- <i class=\"fas fa-fw fa-th mr-2 ml-2\"></i>\n+ <i class=\"fas fa-fw fa-th\"></i>\n{{ labels.button_from_library }}\n</button>\n- </div>\n-\n- <div v-if=\"filenameData\" class=\"btn-group mr-2\" role=\"group\">\n<a\n- class=\"btn btn-sm btn-secondary\"\n+ v-if=\"filenameData\"\n+ class=\"dropdown-item\"\n:href=\"attributesLink + '?file=' + filenameData\"\ntarget=\"_blank\"\n>\n{{ labels.button_edit_attributes }}\n</a>\n</div>\n+ </div>\n<div v-if=\"inImagelist == true\" class=\"btn-group mr-2\" role=\"group\">\n<button\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Imagelist.vue",
"new_path": "assets/js/app/editor/Components/Imagelist.vue",
"diff": "></editor-image>\n</div>\n- <button class=\"btn btn-secondary\" type=\"button\" @click=\"addImage\">\n+ <button class=\"btn btn-tertiary\" type=\"button\" @click=\"addImage\">\n+ <i class=\"fas fa-fw fa-plus\"></i>\n{{ labels.add_new_image }}\n</button>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/init/_base.scss",
"new_path": "assets/scss/init/_base.scss",
"diff": "@@ -42,6 +42,7 @@ code {\n.card-header {\nfont-weight: $font-weight-bold;\n+ padding: 0.8125rem 1.25rem;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/init/_variables.scss",
"new_path": "assets/scss/init/_variables.scss",
"diff": "@@ -37,7 +37,7 @@ $link-color: var(--primary);\n$link-hover-color: var(--primary-600);\n//buttons\n-$btn-disabled-opacity: 1;\n+$btn-disabled-opacity: 0.75;\n// Form controls\n$border-radius: 0.15rem;\n@@ -68,7 +68,7 @@ $btn-padding-x: 0.6rem;\n$primary: #1863af;\n$secondary: #5da1ac;\n-$tertiary: #7a9196;\n+$tertiary: #81969B;\n$success: #61a31f;\n$info: #17a2b8;\n$warning: #ffc107;\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/modules/base/_buttons.scss",
"new_path": "assets/scss/modules/base/_buttons.scss",
"diff": ".btn-hidden-danger {\n@include button-variant($tertiary, $tertiary, darken($danger, 7.5%), darken($danger, 10%), darken($danger, 10%), darken($danger, 12.5%));\n}\n+\n+$theme-colors: (\n+ \"primary\": $primary,\n+ \"secondary\": $secondary,\n+ \"tertiary\": $tertiary,\n+ \"success\": $success,\n+ \"info\": $info,\n+ \"warning\": $warning,\n+ \"danger\": $danger,\n+ \"light\": $light,\n+ \"dark\": $dark,\n+ \"boltblue\": $bolt-blue,\n+);\n+\n+@each $color, $value in $theme-colors {\n+ .alert-#{$color} {\n+ background-color: theme-color-level($color, $alert-bg-level) !important;\n+ }\n+\n+ .btn-#{$color} {\n+ @include button-variant($value, $value);\n+ }\n+\n+ .btn-outline-#{$color} {\n+ @include button-outline-variant($value);\n+ }\n+}\n+\n+//set disabled buttons to grey\n+\n+.btn {\n+ &.disabled,\n+ &:disabled {\n+ opacity: $btn-disabled-opacity;\n+\n+ @include box-shadow(none);\n+\n+ background: $disabled;\n+ color: darken($disabled, 30%);\n+ border: $btn-border-width solid transparent;\n+ }\n+}\n+\n+.btn-link {\n+ &:disabled,\n+ &.disabled {\n+ color: darken($disabled, 30%);\n+ background: transparent;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "assets/scss/vendor/bootstrap/_overrides.scss",
"new_path": null,
"diff": "-$theme-colors: (\n- \"primary\": $primary,\n- \"secondary\": $secondary,\n- \"tertiary\": $tertiary,\n- \"success\": $success,\n- \"info\": $info,\n- \"warning\": $warning,\n- \"danger\": $danger,\n- \"light\": $light,\n- \"dark\": $dark,\n- \"boltblue\": $bolt-blue,\n-);\n-\n-@each $color, $value in $theme-colors {\n- .alert-#{$color} {\n- background-color: theme-color-level($color, $alert-bg-level) !important;\n- }\n-\n- .btn-#{$color} {\n- @include button-variant($value, $value);\n- }\n-\n- .btn-outline-#{$color} {\n- @include button-outline-variant($value);\n- }\n-}\n-\n-//set disabled buttons to grey\n-\n-.btn {\n- &.disabled,\n- &:disabled {\n- opacity: $btn-disabled-opacity;\n-\n- @include box-shadow(none);\n-\n- background: $disabled;\n- color: darken($disabled, 30%);\n- border: $btn-border-width solid transparent;\n- }\n-}\n-\n-.btn-link {\n- &:disabled,\n- &.disabled {\n- color: darken($disabled, 30%);\n- background: transparent;\n- }\n-}\n-\n-.card-header {\n- padding: 0.8125rem 1.25rem;\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"new_path": "assets/scss/vendor/bootstrap/bootstrap.scss",
"diff": "@import \"~bootstrap/scss/utilities\";\n@import \"~bootstrap/scss/print\";\n-// Bolt Bootstrap overrides\n-@import '_overrides.scss';\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_buttons.html.twig",
"new_path": "templates/content/_buttons.html.twig",
"diff": "data-toggle=\"dropdown\" type=\"button\">\n<span class=\"sr-only\">{{ 'buttons.button_toggle'|trans }}</span>\n</button>\n- <button class=\"btn btn-light dropdown-menu dropdown-menu-right\"\n+ <div class=\"dropdown-menu dropdown-menu-right\">\n+ <button class=\"btn\"\nform=\"editcontent\"\nformaction=\"{{ path('bolt_content_edit_viewsave', {'id': record.id }) }}\"\nformtarget=\"_blank\" style=\"white-space: nowrap; padding-right: 1rem;\"\n<i class=\"fas fa-external-link-square-alt mr-2 ml-2\"></i>\n{{ 'action.view_saved'|trans }}\n</button>\n+ </div>\n{% endif %}\n</div>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Fine-tuning a bunch of button styles
|
95,144 |
26.12.2019 13:20:44
| -3,600 |
d1638adadde56f17d0bfbf6f623bc74478104a47
|
Minor fix: Keep track of alt-attribute
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Image.vue",
"new_path": "assets/js/app/editor/Components/Image.vue",
"diff": "@@ -171,7 +171,7 @@ export default {\nprogress: 0,\nfilenameData: this.filename,\nthumbnailData: this.thumbnail,\n- altData: this.data,\n+ altData: this.alt,\n};\n},\ncomputed: {\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Minor fix: Keep track of alt-attribute
|
95,144 |
28.12.2019 15:02:43
| -3,600 |
834de255a0b75bd0273bf8c682835233e0819c31
|
Make Filelist and Imagelist work in frontend
|
[
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_field_blocks.twig",
"new_path": "templates/helpers/_field_blocks.twig",
"diff": "</div>\n{% endblock %}\n-{# Sub-block for 'imagelist' fields #}\n-{% block imagelist_field %}\n- <div class=\"bolt-imagelist\">\n- {% for image in field %}\n- <div class=\"bolt-imageholder\">\n- {{ popup(image.filename, 200, 0) }}\n- </div>\n- {% endfor %}\n- </div>\n-{% endblock %}\n-\n{# Block for \"basic\" fields like HTML, Markdown, Textarea and Text #}\n{% block common_fields %}\n{{ field|showimage('684') }}\n{% endif %}\n+ {# File fields #}\n+ {% if type == \"file\" and field is not empty %}\n+ <p>{{ __('general.phrase.download') }}:\n+ <a href=\"{{ field }}\">{{ field.title|default(field.filename) }}</a>\n+ </p>\n+ {% endif %}\n+\n{# Video fields #}\n{% if type == \"video\" and field.responsive|default is not empty %}\n<div class=\"flex-video {{ field.ratio|default(1) > 1.5 ? 'widescreen' }}\">\n<p><strong>{{ field|label }}</strong>: {{ field ? \"checked\" : \"not checked\" }}</p>\n{% endif %}\n- {# Imagelist fields #}\n- {% if type == \"imagelist\" and field is not empty %}\n- {{ block('imagelist_field') }}\n- {% endif %}\n-\n{# No special case defined for this type of field. We just output them, if it's\na simple scalar, and 'dump' them otherwise. #}\n- {% if type in [ 'filelist', 'datetime', 'date', 'integer', 'float' ] and field is not empty %}\n+ {% if type in ['datetime', 'date', 'integer', 'float' ] and field is not empty %}\n<p><strong>{{ field|label }}: </strong>\n{% if field is iterable %}\n{{ dump(field) }}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_fields.twig",
"new_path": "templates/helpers/_fields.twig",
"diff": "{# Fields that are considered 'common': 'html', 'markdown', 'textarea',\n'text', 'image', 'video' and 'imagelist' #}\n{% if common|default(true) and (type not in exclude|default([])) %}\n-\n{{ block('common_fields') }}\n-\n{% endif %}\n{# The rest of the built-in types #}\n{% if extended|default(false) and (type not in exclude|default([])) %}\n+ {{ block('extended_fields') }}\n+ {% endif %}\n+ {# Finally, the collections, filelists and imagelists #}\n+ {% if type in ['collection', 'filelist', 'imagelist'] %}\n+\n+ {% for field in field.value %}\n+ {% set type = field.type %}\n+\n+ {% if common|default(true) and (type not in exclude|default([])) %}\n+ {{ block('common_fields') }}\n+ {% endif %}\n+\n+ {% if extended|default(false) and (type not in exclude|default([])) %}\n{{ block('extended_fields') }}\n+ {% endif %}\n+ {% endfor %}\n{% endif %}\n+\n+\n{% endfor %}\n{% endblock sub_fields %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make Filelist and Imagelist work in frontend
|
95,144 |
28.12.2019 15:42:42
| -3,600 |
5839a0337243eef41b3c78f8b2078aef79bc9866
|
Make Filelist work in frontend
|
[
{
"change_type": "MODIFY",
"old_path": "src/Entity/Field/FilelistField.php",
"new_path": "src/Entity/Field/FilelistField.php",
"diff": "@@ -18,16 +18,41 @@ class FilelistField extends Field implements FieldInterface\nreturn 'filelist';\n}\n+ /**\n+ * Returns the value, as is in the database. Useful for processing, like\n+ * editing in the backend, where the results are to be serialised\n+ */\n+ public function getRawValue(): array\n+ {\n+ return (array) parent::getValue() ?: [];\n+ }\n+\n+ /**\n+ * Returns the value, where the contained fields are \"hydrated\" as actual\n+ * File Fields. For example, for iterating in the frontend\n+ */\npublic function getValue(): array\n{\n- $files = (array) parent::getValue() ?: [];\n$result = [];\n- foreach ($files as $key => $file) {\n+\n+ foreach ($this->getRawValue() as $key => $file) {\n$fileField = new FileField();\n$fileField->setName((string) $key);\n$fileField->setValue($file);\n- array_push($result, $fileField->getValue());\n+ array_push($result, $fileField);\n}\n+\nreturn $result;\n}\n+\n+ /**\n+ * Returns the value, where the contained Image fields are seperately\n+ * casted to arrays, including the \"extras\"\n+ */\n+ public function getJsonValue()\n+ {\n+ return json_encode(array_map(function (FileField $i) {\n+ return $i->getValue();\n+ }, $this->getValue()));\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/filelist.html.twig",
"new_path": "templates/_partials/fields/filelist.html.twig",
"diff": "{% set extensions = field.definition.get('extensions')|default('') %}\n<editor-filelist\n- :files='{{ field.value|json_encode }}'\n+ :files='{{ field.jsonvalue }}'\n:name='{{ name|json_encode }}'\n:directory='{{ directory|json_encode }}'\n:filelist='{{ filelist|json_encode }}'\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Make Filelist work in frontend
|
95,144 |
28.12.2019 17:22:48
| -3,600 |
efe9e2a0ac81a430503897f79de18058a5cde2dd
|
Update imagelist.html.twig
|
[
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/imagelist.html.twig",
"new_path": "templates/_partials/fields/imagelist.html.twig",
"diff": "{% set extensions = field.definition.get('extensions')|default('') %}\n<editor-imagelist\n- :images='{{ field.value|json_encode }}'\n+ :images='{{ field.jsonvalue }}'\n:name='{{ name|json_encode }}'\n:directory='{{ directory|json_encode }}'\n:filelist='{{ filelist|json_encode }}'\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Update imagelist.html.twig
|
95,144 |
28.12.2019 18:33:20
| -3,600 |
3dc05e204d5eae59c21cda489c710aaa5027e8e9
|
Add note about sets
|
[
{
"change_type": "MODIFY",
"old_path": "templates/helpers/_fields.twig",
"new_path": "templates/helpers/_fields.twig",
"diff": "{% endif %}\n{# Finally, the collections, filelists and imagelists #}\n- {% if type in ['collection', 'filelist', 'imagelist'] and (type not in exclude|default([])) %}\n+ {% if type in ['collection', 'filelist', 'imagelist', 'set'] and (type not in exclude|default([])) %}\n- {% for field in field.value %}\n- {% set type = field.type|default('foo') %}\n-\n- {% if common|default(true) %}\n+ {# @todo Make set return _just_ the array of fields for `.value` and `getValue()`. See issue #822 #}\n+ {# note: For sets we need `field.value.fields`, hence the seemingly obtuse way to iterate over them #}\n+ {% for field in field.value.fields|default(field.value) %}\n+ {% set type = field.type %}\n{{ block('common_fields') }}\n- {% endif %}\n-\n- {% if extended|default(false) %}\n{{ block('extended_fields') }}\n- {% endif %}\n-\n{% endfor %}\n{% endif %}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<target>Down</target>\n</segment>\n</unit>\n+ <unit id=\"fon6eNN\" name=\"general.phrase.download\">\n+ <segment>\n+ <source>general.phrase.download</source>\n+ <target>Download</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add note about sets
|
95,144 |
29.12.2019 14:57:44
| -3,600 |
5e8f1ee8ba14568fd82e6648f5038ec490504170
|
Automatically Publish and Depublish Timed records
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Event/Subscriber/TimedPublishSubscriber.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Event\\Subscriber;\n+\n+use Doctrine\\ORM\\EntityManagerInterface;\n+use Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n+use Symfony\\Component\\HttpKernel\\KernelEvents;\n+\n+class TimedPublishSubscriber implements EventSubscriberInterface\n+{\n+ public const PRIORITY = 30;\n+\n+ /** @var EntityManagerInterface */\n+ private $entityManager;\n+\n+ public function __construct(EntityManagerInterface $entityManager)\n+ {\n+ $this->entityManager = $entityManager;\n+ }\n+\n+ /**\n+ * Kernel request listener callback.\n+ */\n+ public function onKernelRequest(): void\n+ {\n+ $conn = $this->entityManager->getConnection();\n+\n+ // Publish timed Content records when 'publish_at' has passed.\n+ $conn->executeUpdate(\n+ 'update bolt_content SET status = \"published\", published_at = :now WHERE status = \"timed\" AND published_at < :now',\n+ [':now' => date('Y-m-d H:i:s')]\n+ );\n+\n+ // Depublish published Content records when 'depublish_at' has passed.\n+ $conn->executeUpdate(\n+ 'update bolt_content SET status = \"held\", depublished_at = \"1900-01-01 10:10:10\" WHERE status = \"published\" AND depublished_at > :now',\n+ [':now' => date('Y-m-d H:i:s')]\n+ );\n+ }\n+\n+ /**\n+ * Return the events to subscribe to.\n+ */\n+ public static function getSubscribedEvents(): array\n+ {\n+ return [\n+ KernelEvents::REQUEST => [['onKernelRequest', self::PRIORITY]], // Right after route is matched\n+ ];\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Automatically Publish and Depublish Timed records
|
95,144 |
30.12.2019 18:23:03
| -3,600 |
f55a64778e2b705bdce53b1093778002fb8ffd1a
|
A number of fixes for timezone handling, and the selectors in the editor.
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Date.vue",
"new_path": "assets/js/app/editor/Components/Date.vue",
"diff": "</flat-pickr>\n<div class=\"input-group-append\">\n<button\n- class=\"btn btn-secondary\"\n+ class=\"btn btn-tertiary\"\n:class=\"{ 'btn-outline-secondary': disabled }\"\ntype=\"button\"\n:disabled=\"disabled\"\n<span class=\"sr-only\" aria-hidden=\"true\">{{ labels.toggle }}</span>\n</i>\n</button>\n+ <button\n+ class=\"btn btn-tertiary\"\n+ :class=\"{ 'btn-outline-secondary': disabled }\"\n+ type=\"button\"\n+ :disabled=\"disabled\"\n+ data-clear\n+ >\n+ <i class=\"fa fa-times\">\n+ <span class=\"sr-only\" aria-hidden=\"true\">{{ labels.clear }}</span>\n+ </i>\n+ </button>\n</div>\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -5,10 +5,10 @@ parameters:\n# This parameter defines the codes of the locales (languages) enabled in the application\napp_locales: en|nl|es|fr|de|pl|it|hu|pt_BR|ja|nb|nn|nl_NL|nl_BE\napp.notifications.email_sender: anonymous@example.com\n- doctrine.orm.entity_manager.class: Bolt\\Doctrine\\TranslatableEntityManager\n- stof_doctrine_extensions.listener.translatable.class: Bolt\\Event\\Listener\\PreTranslatableListener\nbolt.table_prefix: bolt_\nbolt.backend_url: /bolt\n+ doctrine.orm.entity_manager.class: Bolt\\Doctrine\\TranslatableEntityManager\n+ stof_doctrine_extensions.listener.translatable.class: Bolt\\Event\\Listener\\PreTranslatableListener\nservices:\n# default configuration for services in *this* file\n@@ -35,33 +35,30 @@ services:\nresource: '../src/Controller'\ntags: ['controller.service_arguments']\n- Bolt\\Event\\Listener\\FieldDiscriminatorListener:\n+ # Override Symfony's error pages (so we can show custom 404's)\n+ Bolt\\Controller\\ExceptionController:\n+ public: true\n+ arguments:\n+ $debug: '%kernel.debug%'\n+\n+ Bolt\\Doctrine\\TablePrefix:\n+ arguments: [ \"%bolt.table_prefix%\" ]\ntags:\n- - { name: doctrine.event_listener, event: loadClassMetadata }\n+ - { name: doctrine.event_listener, event: loadClassMetadata, lazy: true }\nBolt\\Event\\Listener\\ContentFillListener:\ntags:\n- { name: doctrine.event_listener, event: postLoad }\n- Twig\\Extension\\StringLoaderExtension: ~\n- Doctrine\\ORM\\Query\\Expr: ~\n-\n- # Needed for SetContent from bolt/core\n- Bolt\\Storage\\Query:\n- calls:\n- -\n- method: addScope\n- arguments: [ 'frontend', '@Bolt\\Storage\\FrontendQueryScope' ]\n- Bolt\\Storage\\ContentQueryParser:\n- calls:\n- -\n- method: addService\n- arguments: [ 'select', '@Bolt\\Storage\\SelectQuery' ]\n+ Bolt\\Event\\Listener\\FieldDiscriminatorListener:\n+ tags:\n+ - { name: doctrine.event_listener, event: loadClassMetadata }\n- Bolt\\Doctrine\\TablePrefix:\n+ Bolt\\Event\\Subscriber\\TimedPublishSubscriber:\narguments: [ \"%bolt.table_prefix%\" ]\n- tags:\n- - { name: doctrine.event_listener, event: loadClassMetadata, lazy: true }\n+\n+ Bolt\\Extension\\RoutesLoader:\n+ tags: [routing.loader]\n# menus\nBolt\\Menu\\BackendMenuBuilder:\n@@ -73,11 +70,20 @@ services:\nBolt\\Menu\\FrontendMenuBuilder: ~\nBolt\\Menu\\FrontendMenuBuilderInterface: '@Bolt\\Menu\\FrontendMenuBuilder'\n- # Override Symfony's error pages (so we can show custom 404's)\n- Bolt\\Controller\\ExceptionController:\n- public: true\n- arguments:\n- $debug: '%kernel.debug%'\n+ # Needed for SetContent from bolt/core\n+ Bolt\\Storage\\ContentQueryParser:\n+ calls:\n+ -\n+ method: addService\n+ arguments: [ 'select', '@Bolt\\Storage\\SelectQuery' ]\n+\n+ Bolt\\Storage\\Query:\n+ calls:\n+ -\n+ method: addScope\n+ arguments: [ 'frontend', '@Bolt\\Storage\\FrontendQueryScope' ]\n+\n+ Doctrine\\ORM\\Query\\Expr: ~\n+\n+ Twig\\Extension\\StringLoaderExtension: ~\n- Bolt\\Extension\\RoutesLoader:\n- tags: [routing.loader]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Backend/ContentEditController.php",
"new_path": "src/Controller/Backend/ContentEditController.php",
"diff": "@@ -277,8 +277,8 @@ class ContentEditController extends TwigAwareController implements BackendZone\n$content->setStatus($status);\n}\n- $content->setPublishedAt(new Carbon($formData['publishedAt']));\n- $content->setDepublishedAt(new Carbon($formData['depublishedAt']));\n+ $content->setPublishedAt(! empty($formData['publishedAt']) ? new Carbon($formData['publishedAt']) : null);\n+ $content->setDepublishedAt(! empty($formData['depublishedAt']) ? new Carbon($formData['depublishedAt']) : null);\nif (isset($formData['fields'])) {\nforeach ($formData['fields'] as $fieldName => $fieldValue) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DataFixtures/ContentFixtures.php",
"new_path": "src/DataFixtures/ContentFixtures.php",
"diff": "@@ -100,7 +100,6 @@ class ContentFixtures extends BaseFixture implements DependentFixtureInterface,\n$content->setCreatedAt($this->faker->dateTimeBetween('-1 year'));\n$content->setModifiedAt($this->faker->dateTimeBetween('-1 year'));\n$content->setPublishedAt($this->faker->dateTimeBetween('-1 year'));\n- $content->setDepublishedAt($this->faker->dateTimeBetween('-1 year'));\n$preset = $this->getPreset($contentType['slug']);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Doctrine/TablePrefix.php",
"new_path": "src/Doctrine/TablePrefix.php",
"diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Doctrine;\n+use Bolt\\Common\\Str;\nuse Doctrine\\ORM\\Event\\LoadClassMetadataEventArgs;\nuse Doctrine\\ORM\\Mapping\\ClassMetadataInfo;\n@@ -13,7 +14,7 @@ class TablePrefix\npublic function __construct(string $prefix)\n{\n- $this->prefix = $prefix;\n+ $this->prefix = Str::ensureEndsWith($prefix, '_');\n}\npublic function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Entity/Content.php",
"new_path": "src/Entity/Content.php",
"diff": "@@ -263,7 +263,7 @@ class Content\npublic function getCreatedAt(): ?\\DateTime\n{\n- return $this->createdAt;\n+ return $this->convertToLocalFromDatabase($this->createdAt);\n}\npublic function setCreatedAt(?\\DateTime $createdAt): self\n@@ -275,7 +275,7 @@ class Content\npublic function getModifiedAt(): ?\\DateTime\n{\n- return $this->modifiedAt;\n+ return $this->convertToLocalFromDatabase($this->modifiedAt);\n}\npublic function setModifiedAt(?\\DateTime $modifiedAt): self\n@@ -296,7 +296,7 @@ class Content\npublic function getPublishedAt(): ?\\DateTime\n{\n- return $this->publishedAt;\n+ return $this->convertToLocalFromDatabase($this->publishedAt);\n}\npublic function setPublishedAt(?\\DateTime $publishedAt): self\n@@ -308,7 +308,7 @@ class Content\npublic function getDepublishedAt(): ?\\DateTime\n{\n- return $this->depublishedAt;\n+ return $this->convertToLocalFromDatabase($this->depublishedAt);\n}\npublic function setDepublishedAt(?\\DateTime $depublishedAt): self\n@@ -545,4 +545,21 @@ class Content\nreturn $field->getTwigValue();\n}\n+\n+ /**\n+ * All date/timestamps are stored in the database in UTC. When retrieving\n+ * them, we get the timestamp as-is in the DB with the current local\n+ * timezone slapped onto it. This method converts it back to UTC, and\n+ * then re-applies the current local timezone to it.\n+ */\n+ private function convertToLocalFromDatabase(?\\DateTime $dateTime): ?\\DateTime\n+ {\n+ if (! $dateTime) {\n+ return null;\n+ }\n+\n+ $dateTimeUTC = new \\DateTime($dateTime->format('Y-m-d H:i:s'), new \\DateTimeZone('UTC'));\n+\n+ return $dateTimeUTC->setTimezone($dateTime->getTimezone());\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Event/Subscriber/TimedPublishSubscriber.php",
"new_path": "src/Event/Subscriber/TimedPublishSubscriber.php",
"diff": "@@ -4,6 +4,8 @@ declare(strict_types=1);\nnamespace Bolt\\Event\\Subscriber;\n+use Bolt\\Common\\Str;\n+use Carbon\\Carbon;\nuse Doctrine\\ORM\\EntityManagerInterface;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n@@ -15,9 +17,13 @@ class TimedPublishSubscriber implements EventSubscriberInterface\n/** @var EntityManagerInterface */\nprivate $entityManager;\n- public function __construct(EntityManagerInterface $entityManager)\n+ /** @var string */\n+ private $prefix;\n+\n+ public function __construct(string $prefix, EntityManagerInterface $entityManager)\n{\n$this->entityManager = $entityManager;\n+ $this->prefix = Str::ensureEndsWith($prefix, '_');\n}\n/**\n@@ -26,18 +32,16 @@ class TimedPublishSubscriber implements EventSubscriberInterface\npublic function onKernelRequest(): void\n{\n$conn = $this->entityManager->getConnection();\n+ $now = (new Carbon())->tz('UTC');\n// Publish timed Content records when 'publish_at' has passed.\n- $conn->executeUpdate(\n- 'update bolt_content SET status = \"published\", published_at = :now WHERE status = \"timed\" AND published_at < :now',\n- [':now' => date('Y-m-d H:i:s')]\n- );\n+ // Note: Placeholders in DBAL don't work for tablenames.\n+ $query = sprintf('update %scontent SET status = \"published\", published_at = :now WHERE status = \"timed\" AND published_at < :now', $this->prefix);\n+ $conn->executeUpdate($query, [':now' => $now]);\n// Depublish published Content records when 'depublish_at' has passed.\n- $conn->executeUpdate(\n- 'update bolt_content SET status = \"held\", depublished_at = \"1900-01-01 10:10:10\" WHERE status = \"published\" AND depublished_at > :now',\n- [':now' => date('Y-m-d H:i:s')]\n- );\n+ $query = sprintf('update %scontent SET status = \"held\", depublished_at = :now WHERE status = \"published\" AND depublished_at < :now', $this->prefix);\n+ $conn->executeUpdate($query, [':now' => $now]);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/content/_fields_aside.html.twig",
"new_path": "templates/content/_fields_aside.html.twig",
"diff": "{% include '@bolt/_partials/fields/date.html.twig' with {\n'label' : 'field.depublishedAt'|trans,\n'name' : 'depublishedAt',\n+ 'value' : record.depublishedAt,\n'mode' : 'datetime',\n'form' : 'editcontent'\n} %}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
A number of fixes for timezone handling, and the selectors in the editor.
|
95,144 |
31.12.2019 13:08:01
| -3,600 |
ca8d7d1a63c5ce129107d9eddde608d663f87a01
|
Updating NPM deps, and minor tweaks.
|
[
{
"change_type": "MODIFY",
"old_path": "assets/js/app/editor/Components/Slug.vue",
"new_path": "assets/js/app/editor/Components/Slug.vue",
"diff": "<div class=\"input-group-append\">\n<button\ntype=\"button\"\n- class=\"btn dropdown-toggle\"\n+ class=\"btn btn-tertiary dropdown-toggle\"\ndata-toggle=\"dropdown\"\naria-haspopup=\"true\"\naria-expanded=\"false\"\n"
},
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "}\n},\n\"eslint-config-prettier\": {\n- \"version\": \"6.8.0\",\n- \"resolved\": \"https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.8.0.tgz\",\n- \"integrity\": \"sha512-aq4M7mjjVregZ2l45O9qz6Mv6f5zVMl/IqfmUL8hNOoDAzVKYMhYPJytbqE/lPIVO1iMDXIFqjiEE59BfJZpZw==\",\n+ \"version\": \"6.9.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz\",\n+ \"integrity\": \"sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==\",\n\"dev\": true,\n\"requires\": {\n\"get-stdin\": \"^6.0.0\"\n\"dev\": true\n},\n\"eslint-plugin-vue\": {\n- \"version\": \"6.0.2\",\n- \"resolved\": \"https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.0.2.tgz\",\n- \"integrity\": \"sha512-LF0AeuCjzTe+enkvvtvKClG3iYZwMKE3M6yEUZruUHNolLwqGqbEULzvMmojr+8KlMl//Ya1k7dKVt4HFASKfw==\",\n+ \"version\": \"6.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz\",\n+ \"integrity\": \"sha512-M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw==\",\n\"dev\": true,\n\"requires\": {\n- \"vue-eslint-parser\": \"^6.0.5\"\n+ \"semver\": \"^5.6.0\",\n+ \"vue-eslint-parser\": \"^7.0.0\"\n+ },\n+ \"dependencies\": {\n+ \"semver\": {\n+ \"version\": \"5.7.1\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-5.7.1.tgz\",\n+ \"integrity\": \"sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==\",\n+ \"dev\": true\n+ }\n}\n},\n\"eslint-scope\": {\n},\n\"dependencies\": {\n\"@types/node\": {\n- \"version\": \"10.17.12\",\n- \"resolved\": \"https://registry.npmjs.org/@types/node/-/node-10.17.12.tgz\",\n- \"integrity\": \"sha512-SSB4O9/0NVv5mbQ5/MabnAyFfcpVFRVIJj1TZkG21HHgwXQGjosiQB3SBWC9pMCMUTNpWL9gUe//9mFFPQAdKw==\"\n+ \"version\": \"10.17.13\",\n+ \"resolved\": \"https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz\",\n+ \"integrity\": \"sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==\"\n}\n}\n},\n}\n},\n\"trumbowyg\": {\n- \"version\": \"2.20.0\",\n- \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.20.0.tgz\",\n- \"integrity\": \"sha512-XdGZtc2eVF7LsMjb/Ilcgqj4ClkPlXz79mxbaQGvBttGodj36JF+HggHGgqtTAcqVXHx0viz9lYPf14zz1rRaA==\"\n+ \"version\": \"2.21.0\",\n+ \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.21.0.tgz\",\n+ \"integrity\": \"sha512-TUatXrv2PgaYjgIZdh4G0UgZsFd9cmkw4ZGrQBWrXNDtf2cn+1TEgLGd/jVj0MWGxEYfbrZXmURf9UQlEMLGFg==\"\n},\n\"tryer\": {\n\"version\": \"1.0.1\",\n\"integrity\": \"sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==\"\n},\n\"vue-eslint-parser\": {\n- \"version\": \"6.0.5\",\n- \"resolved\": \"https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-6.0.5.tgz\",\n- \"integrity\": \"sha512-Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg==\",\n+ \"version\": \"7.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz\",\n+ \"integrity\": \"sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g==\",\n\"dev\": true,\n\"requires\": {\n\"debug\": \"^4.1.1\",\n- \"eslint-scope\": \"^4.0.0\",\n- \"eslint-visitor-keys\": \"^1.0.0\",\n- \"espree\": \"^5.0.0\",\n+ \"eslint-scope\": \"^5.0.0\",\n+ \"eslint-visitor-keys\": \"^1.1.0\",\n+ \"espree\": \"^6.1.2\",\n\"esquery\": \"^1.0.1\",\n- \"lodash\": \"^4.17.11\"\n+ \"lodash\": \"^4.17.15\"\n},\n\"dependencies\": {\n- \"espree\": {\n- \"version\": \"5.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/espree/-/espree-5.0.1.tgz\",\n- \"integrity\": \"sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==\",\n+ \"eslint-scope\": {\n+ \"version\": \"5.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz\",\n+ \"integrity\": \"sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==\",\n\"dev\": true,\n\"requires\": {\n- \"acorn\": \"^6.0.7\",\n- \"acorn-jsx\": \"^5.0.0\",\n- \"eslint-visitor-keys\": \"^1.0.0\"\n+ \"esrecurse\": \"^4.1.0\",\n+ \"estraverse\": \"^4.1.1\"\n}\n}\n}\n\"dev\": true\n},\n\"vue-simplemde\": {\n- \"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/vue-simplemde/-/vue-simplemde-1.0.3.tgz\",\n- \"integrity\": \"sha512-4zK1KcDgUODv8ZJR3439K/mOccDwtT9f1i0In4q7/tKgUydftp2X5sjZO4jcxftp0tYQy/R463vfI0LxvPlttg==\",\n+ \"version\": \"1.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/vue-simplemde/-/vue-simplemde-1.0.4.tgz\",\n+ \"integrity\": \"sha512-UpQA8nQkYeAtgwFyMG2WUjaggmQq+PAFN+rDNRZxSGYAbsNldv/LC2L1pUINNTYqazTdbKsF1nGRsTbRH7Dt8A==\",\n\"requires\": {\n\"marked\": \"*\",\n\"simplemde\": \"*\"\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"vue\": \"^2.6.11\",\n\"vue-flatpickr-component\": \"^8.1.5\",\n\"vue-multiselect\": \"^2.1.6\",\n- \"vue-simplemde\": \"^1.0.3\",\n+ \"vue-simplemde\": \"^1.0.4\",\n\"vue-trumbowyg\": \"^3.4.2\",\n\"vuedraggable\": \"^2.23.2\",\n\"vuex\": \"^3.1.2\",\n\"babel-eslint\": \"^10.0.3\",\n\"babel-jest\": \"^24.9.0\",\n\"eslint\": \"^6.8.0\",\n- \"eslint-config-prettier\": \"^6.8.0\",\n+ \"eslint-config-prettier\": \"^6.9.0\",\n\"eslint-plugin-prettier\": \"^3.1.2\",\n\"eslint-plugin-standard\": \"^4.0.1\",\n- \"eslint-plugin-vue\": \"^6.0.2\",\n+ \"eslint-plugin-vue\": \"^6.1.2\",\n\"jest\": \"^24.9.0\",\n\"jest-serializer-vue\": \"^2.0.2\",\n\"node-sass\": \"^4.13.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/_partials/fields/_collection_buttons.html.twig",
"new_path": "templates/_partials/fields/_collection_buttons.html.twig",
"diff": "{% if in_collection is defined %}\n- <div class=\"float-right\" role=\"group\" aria-label=\"Collection buttons\">\n+ <div class=\"float-right\" role=\"group\" aria-label=\"Collection buttons\" style=\"margin-top: -0.25rem; margin-bottom: 0.75rem;\">\n<input type=\"hidden\" name=\"collections[{{ collection_name }}][order][]\" value=\"{{ hash }}\">\n<button class='action-move-up-collection-item btn btn-secondary btn-sm' {% if is_first is defined and is_first %} disabled {% endif %}>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Updating NPM deps, and minor tweaks.
|
95,144 |
03.01.2020 20:25:23
| -3,600 |
9838fa2aec6be8689eb93941d9cf3b2eeeff181c
|
Prevent breakage when switching to PROD, with {{ dump }} in the templates
|
[
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -67,7 +67,9 @@ services:\n- { name: knp_menu.menu_builder, method: createAdminMenu, alias: admin_menu } # The alias is what is used to retrieve the menu\nBolt\\Menu\\BackendMenuBuilderInterface: '@Bolt\\Menu\\BackendMenuBuilder'\n+\nBolt\\Menu\\FrontendMenuBuilder: ~\n+\nBolt\\Menu\\FrontendMenuBuilderInterface: '@Bolt\\Menu\\FrontendMenuBuilder'\n# Needed for SetContent from bolt/core\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Twig/DumpExtension.php",
"diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Twig;\n+\n+use Twig\\Extension\\AbstractExtension;\n+use Twig\\TwigFunction;\n+\n+/**\n+ * Dump Twig extension.\n+ *\n+ * This is a (deliberately) empty extension. When the implementor switched a\n+ * site from DEV to PROD, it shouldn't break if there's a lingering `{{ dump }}`\n+ * left in the site. This Twig Extension acts as a fallback to prevent that.\n+ */\n+class DumpExtension extends AbstractExtension\n+{\n+ public function getFunctions(): array\n+ {\n+ return [\n+ new TwigFunction('dump', [$this, 'dump']),\n+ ];\n+ }\n+\n+ public function dump(): void\n+ {\n+ }\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Prevent breakage when switching to PROD, with {{ dump }} in the templates
|
95,144 |
03.01.2020 16:15:26
| -3,600 |
ab438c6cd00a92fe9567ce773db1d51bd4a33d29
|
Add logging (viewable in backend), next to exisiting Monolog file-based logging
|
[
{
"change_type": "MODIFY",
"old_path": "config/packages/dev/monolog.yaml",
"new_path": "config/packages/dev/monolog.yaml",
"diff": "monolog:\n+ channels: ['db']\nhandlers:\nmain:\ntype: stream\n@@ -17,3 +18,7 @@ monolog:\ntype: console\nprocess_psr_3_messages: false\nchannels: ['!event', '!doctrine', '!console']\n+ db:\n+ channels: ['db']\n+ type: service\n+ id: Bolt\\Log\\LogHandler\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "config/services.yaml",
"new_path": "config/services.yaml",
"diff": "@@ -87,5 +87,10 @@ services:\nDoctrine\\ORM\\Query\\Expr: ~\n+ monolog.processor.request:\n+ class: Bolt\\Log\\RequestProcessor\n+ tags:\n+ - { name: monolog.processor, method: processRecord, handler: db }\n+\nTwig\\Extension\\StringLoaderExtension: ~\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "public/theme/leaf",
"diff": "+../../../themedev/bolt-leaf-theme\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Controller/Frontend/HomepageController.php",
"new_path": "src/Controller/Frontend/HomepageController.php",
"diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Controller\\Frontend;\nuse Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Repository\\ContentRepository;\nuse Bolt\\TemplateChooser;\n+use Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n@@ -15,9 +16,13 @@ class HomepageController extends TwigAwareController implements FrontendZone\n/** @var TemplateChooser */\nprivate $templateChooser;\n- public function __construct(TemplateChooser $templateChooser)\n+ /** @var LoggerInterface */\n+ private $logger;\n+\n+ public function __construct(TemplateChooser $templateChooser, LoggerInterface $dbLogger)\n{\n$this->templateChooser = $templateChooser;\n+ $this->logger = $dbLogger;\n}\n/**\n@@ -40,6 +45,8 @@ class HomepageController extends TwigAwareController implements FrontendZone\n$templates = $this->templateChooser->forHomepage();\n+ $this->logger->notice('Joehoe!', ['foo' => 'bar']);\n+\nreturn $this->renderTemplate($templates, ['record' => $record]);\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Entity/Log.php",
"diff": "+<?php\n+\n+\n+namespace Bolt\\Entity;\n+\n+use Doctrine\\ORM\\Mapping as ORM;\n+\n+/**\n+ * @ORM\\Entity(repositoryClass=\"AppBundle\\Repository\\LogRepository\")\n+ * @ORM\\Table(name=\"log\")\n+ * @ORM\\HasLifecycleCallbacks\n+ */\n+class Log\n+{\n+ /**\n+ * @ORM\\Id\n+ * @ORM\\Column(type=\"integer\")\n+ * @ORM\\GeneratedValue(strategy=\"AUTO\")\n+ */\n+ private $id;\n+\n+ /**\n+ * @ORM\\Column(name=\"message\", type=\"text\")\n+ */\n+ private $message;\n+\n+ /**\n+ * @ORM\\Column(name=\"context\", type=\"array\", nullable=true)\n+ */\n+ private $context;\n+\n+ /**\n+ * @ORM\\Column(name=\"level\", type=\"smallint\")\n+ */\n+ private $level;\n+\n+ /**\n+ * @ORM\\Column(name=\"level_name\", type=\"string\", length=50)\n+ */\n+ private $levelName;\n+\n+ /**\n+ * @ORM\\Column(name=\"created_at\", type=\"datetime\")\n+ */\n+ private $createdAt;\n+\n+ /**\n+ * @ORM\\Column(name=\"extra\", type=\"array\", nullable=true)\n+ */\n+ private $extra;\n+\n+ /**\n+ * @ORM\\Column(name=\"user\", type=\"array\", nullable=true)\n+ */\n+ private $user;\n+\n+ /**\n+ * @ORM\\Column(name=\"location\", type=\"array\", nullable=true)\n+ */\n+ private $location;\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getId()\n+ {\n+ return $this->id;\n+ }\n+\n+ /**\n+ * @param mixed $id\n+ * @return Log\n+ */\n+ public function setId($id)\n+ {\n+ $this->id = $id;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getMessage()\n+ {\n+ return $this->message;\n+ }\n+\n+ /**\n+ * @param mixed $message\n+ * @return Log\n+ */\n+ public function setMessage($message)\n+ {\n+ $this->message = $message;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getContext()\n+ {\n+ return $this->context;\n+ }\n+\n+ /**\n+ * @param mixed $context\n+ * @return Log\n+ */\n+ public function setContext($context)\n+ {\n+ $this->context = $context;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getLevel()\n+ {\n+ return $this->level;\n+ }\n+\n+ /**\n+ * @param mixed $level\n+ * @return Log\n+ */\n+ public function setLevel($level)\n+ {\n+ $this->level = $level;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getLevelName()\n+ {\n+ return $this->levelName;\n+ }\n+\n+ /**\n+ * @param mixed $levelName\n+ * @return Log\n+ */\n+ public function setLevelName($levelName)\n+ {\n+ $this->levelName = $levelName;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getExtra()\n+ {\n+ return $this->extra;\n+ }\n+\n+ /**\n+ * @param mixed $extra\n+ * @return Log\n+ */\n+ public function setExtra($extra)\n+ {\n+ dump($extra);\n+ $this->extra = $extra;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getCreatedAt()\n+ {\n+ return $this->createdAt;\n+ }\n+\n+ /**\n+ * @param mixed $createdAt\n+ * @return Log\n+ */\n+ public function setCreatedAt($createdAt)\n+ {\n+ $this->createdAt = $createdAt;\n+ return $this;\n+ }\n+\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getLocation()\n+ {\n+ return $this->location;\n+ }\n+\n+ /**\n+ * @param mixed $location\n+ * @return Log\n+ */\n+ public function setLocation($location)\n+ {\n+ $this->location = $location;\n+ return $this;\n+ }\n+\n+ /**\n+ * @return mixed\n+ */\n+ public function getUser()\n+ {\n+ return $this->user;\n+ }\n+\n+ /**\n+ * @param mixed $user\n+ * @return Log\n+ */\n+ public function setUser($user)\n+ {\n+ dump($user);\n+ $this->user = $user;\n+ return $this;\n+ }\n+\n+ /**\n+ * @ORM\\PrePersist\n+ */\n+ public function onPrePersist()\n+ {\n+ $this->createdAt = new \\DateTime();\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Log/LogHandler.php",
"diff": "+<?php\n+\n+\n+namespace Bolt\\Log;\n+\n+\n+use Bolt\\Entity\\Log;\n+use Doctrine\\ORM\\EntityManagerInterface;\n+use Monolog\\Handler\\AbstractProcessingHandler;\n+\n+class LogHandler extends AbstractProcessingHandler\n+{\n+ /**\n+ * @var EntityManagerInterface\n+ */\n+ protected $em;\n+\n+ /**\n+ * MonologDBHandler constructor.\n+ * @param EntityManagerInterface $em\n+ */\n+ public function __construct(EntityManagerInterface $em)\n+ {\n+ parent::__construct();\n+ $this->em = $em;\n+ }\n+\n+ /**\n+ * Called when writing to our database\n+ * @param array $record\n+ */\n+ protected function write(array $record)\n+ {\n+ $logEntry = new Log();\n+ $logEntry->setMessage($record['message']);\n+ $logEntry->setLevel($record['level']);\n+ $logEntry->setLevelName($record['level_name']);\n+ $logEntry->setExtra($record['extra']);\n+ $logEntry->setUser($record['user'] ?? null);\n+ $logEntry->setLocation($record['location'] ?? null);\n+ $logEntry->setContext($record['context']);\n+\n+ $this->em->persist($logEntry);\n+ $this->em->flush();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Log/RequestProcessor.php",
"diff": "+<?php\n+\n+\n+namespace Bolt\\Log;\n+\n+\n+use Bolt\\Entity\\User;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\n+use Symfony\\Component\\HttpFoundation\\RequestStack;\n+use Symfony\\Component\\Security\\Core\\Security;\n+\n+class RequestProcessor\n+{\n+ /** @var RequestStack */\n+ protected $request;\n+\n+ /** @var Security */\n+ private $security;\n+\n+ public function __construct(RequestStack $request, Security $security)\n+ {\n+ $this->request = $request;\n+ $this->security = $security;\n+ }\n+\n+ /**\n+ * @param array $record\n+ * @return array\n+ */\n+ public function processRecord(array $record): array\n+ {\n+ $req = $this->request->getCurrentRequest();\n+\n+ /** @var User $user */\n+ $user = $this->security->getUser();\n+\n+ $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 7);\n+\n+ $record['extra'] = [\n+ 'client_ip' => $req->getClientIp(),\n+ 'client_port' => $req->getPort(),\n+ 'uri' => $req->getUri(),\n+ 'query_string' => $req->getQueryString(),\n+ 'method' => $req->getMethod(),\n+ 'request' => $req->request->all()\n+ ];\n+\n+ if ($user) {\n+ $record['user'] = [\n+ 'id' => $user->getId(),\n+ 'username' => $user->getUsername(),\n+ 'roles' => $user->getRoles(),\n+ ];\n+ }\n+\n+ $record['location'] = [\n+ 'file' => $trace[5]['file'],\n+ 'line' => $trace[5]['line'],\n+ 'class' => $trace[6]['class'],\n+ 'type' => $trace[6]['type'],\n+ 'function' => $trace[6]['function'],\n+\n+ ];\n+\n+ return $record;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Repository/LogRepository.php",
"diff": "+<?php\n+\n+namespace Bolt\\Repository;\n+\n+use Bolt\\Entity\\Log;\n+use Doctrine\\Bundle\\DoctrineBundle\\Repository\\ServiceEntityRepository;\n+use Doctrine\\Common\\Persistence\\ManagerRegistry;\n+\n+/**\n+ * @method Log|null find($id, $lockMode = null, $lockVersion = null)\n+ * @method Log|null findOneBy(array $criteria, array $orderBy = null)\n+ * @method Log[] findAll()\n+ * @method Log[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)\n+ */\n+class LogRepository extends ServiceEntityRepository\n+{\n+ public function __construct(ManagerRegistry $registry)\n+ {\n+ parent::__construct($registry, Log::class);\n+ }\n+\n+ // /**\n+ // * @return Log[] Returns an array of Log objects\n+ // */\n+ /*\n+ public function findByExampleField($value)\n+ {\n+ return $this->createQueryBuilder('l')\n+ ->andWhere('l.exampleField = :val')\n+ ->setParameter('val', $value)\n+ ->orderBy('l.id', 'ASC')\n+ ->setMaxResults(10)\n+ ->getQuery()\n+ ->getResult()\n+ ;\n+ }\n+ */\n+\n+ /*\n+ public function findOneBySomeField($value): ?Log\n+ {\n+ return $this->createQueryBuilder('l')\n+ ->andWhere('l.exampleField = :val')\n+ ->setParameter('val', $value)\n+ ->getQuery()\n+ ->getOneOrNullResult()\n+ ;\n+ }\n+ */\n+}\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Add logging (viewable in backend), next to exisiting Monolog file-based logging
|
95,144 |
04.01.2020 14:24:29
| -3,600 |
48aec6758eae7f7a109a05660eb5a7a60d1f5e52
|
Working on Log Viewer
|
[
{
"change_type": "MODIFY",
"old_path": "config/packages/prod/monolog.yaml",
"new_path": "config/packages/prod/monolog.yaml",
"diff": "monolog:\n+ channels: ['db']\nhandlers:\nmain:\ntype: fingers_crossed\n@@ -13,3 +14,7 @@ monolog:\ntype: console\nprocess_psr_3_messages: false\nchannels: ['!event', '!doctrine']\n+ db:\n+ channels: ['db']\n+ type: service\n+ id: Bolt\\Log\\LogHandler\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Menu/BackendMenuBuilder.php",
"new_path": "src/Menu/BackendMenuBuilder.php",
"diff": "@@ -8,6 +8,7 @@ use Bolt\\Configuration\\Config;\nuse Bolt\\Configuration\\Content\\ContentType;\nuse Bolt\\Repository\\ContentRepository;\nuse Bolt\\Twig\\ContentExtension;\n+use Bolt\\Version;\nuse Knp\\Menu\\FactoryInterface;\nuse Knp\\Menu\\ItemInterface;\nuse Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface;\n@@ -207,6 +208,14 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\n],\n]);\n+ $menu->getChild('Maintenance')->addChild('Log viewer', [\n+ 'uri' => $this->urlGenerator->generate('bolt_logviewer'),\n+ 'extras' => [\n+ 'name' => $t->trans('caption.logviewer'),\n+ 'icon' => 'fa-clipboard',\n+ ],\n+ ]);\n+\n$menu->getChild('Maintenance')->addChild('Bolt API', [\n'uri' => $this->urlGenerator->generate('api_entrypoint'),\n'extras' => [\n@@ -215,13 +224,16 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\n],\n]);\n- $menu->getChild('Maintenance')->addChild('Fixtures', [\n- 'uri' => '',\n- 'extras' => [\n- 'name' => $t->trans('caption.fixtures_dummy_content'),\n- 'icon' => 'fa-hat-wizard',\n- ],\n- ]);\n+ /*\n+ * @todo Make fixtures work from the backend\n+ */\n+ // $menu->getChild('Maintenance')->addChild('Fixtures', [\n+ // 'uri' => '',\n+ // 'extras' => [\n+ // 'name' => $t->trans('caption.fixtures_dummy_content'),\n+ // 'icon' => 'fa-hat-wizard',\n+ // ],\n+ // ]);\n$menu->getChild('Maintenance')->addChild('Clear the cache', [\n'uri' => $this->urlGenerator->generate('bolt_clear_cache'),\n@@ -231,13 +243,16 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\n],\n]);\n- $menu->getChild('Maintenance')->addChild('Installation checks', [\n- 'uri' => '',\n- 'extras' => [\n- 'name' => $t->trans('caption.installation_checks'),\n- 'icon' => 'fa-clipboard-check',\n- ],\n- ]);\n+ /*\n+ * @todo Make Installation checks work from the backend\n+ */\n+ // $menu->getChild('Maintenance')->addChild('Installation checks', [\n+ // 'uri' => '',\n+ // 'extras' => [\n+ // 'name' => $t->trans('caption.installation_checks'),\n+ // 'icon' => 'fa-clipboard-check',\n+ // ],\n+ // ]);\n$menu->getChild('Maintenance')->addChild('Translations', [\n'uri' => $this->urlGenerator->generate('translation_index'),\n@@ -247,7 +262,8 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\n],\n]);\n- // @todo When we're close to stable release, make this less prominent\n+ // Hide this menu item, unless we're on a \"Git clone\" install.\n+ if (Version::installType() === 'Git clone') {\n$menu->getChild('Maintenance')->addChild('The Kitchensink', [\n'uri' => $this->urlGenerator->generate('bolt_kitchensink'),\n'extras' => [\n@@ -255,6 +271,7 @@ final class BackendMenuBuilder implements BackendMenuBuilderInterface\n'icon' => 'fa-bath',\n],\n]);\n+ }\n$menu->getChild('Maintenance')->addChild('About Bolt', [\n'uri' => $this->urlGenerator->generate('bolt_about'),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Security/LoginFormAuthenticator.php",
"new_path": "src/Security/LoginFormAuthenticator.php",
"diff": "@@ -8,6 +8,7 @@ use Bolt\\Entity\\User;\nuse Bolt\\Entity\\UserAuthToken;\nuse Bolt\\Repository\\UserRepository;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n+use Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\HttpFoundation\\RedirectResponse;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\Routing\\RouterInterface;\n@@ -39,13 +40,23 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator\n/** @var ObjectManager */\nprivate $em;\n- public function __construct(UserRepository $userRepository, RouterInterface $router, CsrfTokenManagerInterface $csrfTokenManager, UserPasswordEncoderInterface $passwordEncoder, ObjectManager $em)\n- {\n+ /** @var LoggerInterface */\n+ private $logger;\n+\n+ public function __construct(\n+ UserRepository $userRepository,\n+ RouterInterface $router,\n+ CsrfTokenManagerInterface $csrfTokenManager,\n+ UserPasswordEncoderInterface $passwordEncoder,\n+ ObjectManager $em,\n+ LoggerInterface $dbLogger\n+) {\n$this->userRepository = $userRepository;\n$this->router = $router;\n$this->csrfTokenManager = $csrfTokenManager;\n$this->passwordEncoder = $passwordEncoder;\n$this->em = $em;\n+ $this->logger = $dbLogger;\n}\nprotected function getLoginUrl()\n@@ -114,6 +125,12 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator\n$this->em->persist($user);\n$this->em->flush();\n+ $userArr = [\n+ 'id' => $user->getId(),\n+ 'username' => $user->getUsername(),\n+ ];\n+ $this->logger->notice('User \\'{username}\\' logged in (manually)', $userArr);\n+\nreturn new RedirectResponse($request->getSession()->get(\n'_security.'.$providerKey.'.target_path',\n$this->router->generate('bolt_dashboard')\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Security/LogoutListener.php",
"new_path": "src/Security/LogoutListener.php",
"diff": "@@ -6,6 +6,7 @@ namespace Bolt\\Security;\nuse Bolt\\Entity\\User;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n+use Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface;\n@@ -15,9 +16,13 @@ class LogoutListener implements LogoutHandlerInterface\n{\nprivate $em;\n- public function __construct(ObjectManager $em)\n+ /** @var LoggerInterface */\n+ private $logger;\n+\n+ public function __construct(ObjectManager $em, LoggerInterface $dbLogger)\n{\n$this->em = $em;\n+ $this->logger = $dbLogger;\n}\npublic function logout(Request $request, Response $response, TokenInterface $token): void\n@@ -26,6 +31,13 @@ class LogoutListener implements LogoutHandlerInterface\nif (! $user instanceof User) {\nreturn;\n}\n+\n+ $userArr = [\n+ 'id' => $user->getId(),\n+ 'username' => $user->getUsername(),\n+ ];\n+ $this->logger->notice('User \\'{username}\\' logged out (manually)', $userArr);\n+\n$this->em->remove($user->getUserAuthToken());\n$this->em->flush();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "translations/messages.en.xlf",
"new_path": "translations/messages.en.xlf",
"diff": "<target>Download</target>\n</segment>\n</unit>\n+ <unit id=\"2MtT_h0\" name=\"caption.logviewer\">\n+ <segment>\n+ <source>caption.logviewer</source>\n+ <target>Log Viewer</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"FlGE3qB\" name=\"label.request\">\n+ <segment>\n+ <source>label.request</source>\n+ <target>Request</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"l71Tprl\" name=\"label.trace\">\n+ <segment>\n+ <source>label.trace</source>\n+ <target>Trace</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"29ZEo1r\" name=\"label.context\">\n+ <segment>\n+ <source>label.context</source>\n+ <target>Context</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"txRonia\" name=\"label.id\">\n+ <segment>\n+ <source>label.id</source>\n+ <target>ID</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"IwLLxxx\" name=\"label.level\">\n+ <segment>\n+ <source>label.level</source>\n+ <target>Level</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"51OQi14\" name=\"label.message\">\n+ <segment>\n+ <source>label.message</source>\n+ <target>Message</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"S0f6iTL\" name=\"label.timestamp\">\n+ <segment>\n+ <source>label.timestamp</source>\n+ <target>Timestamp</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"O2X4xZH\" name=\"label.user\">\n+ <segment>\n+ <source>label.user</source>\n+ <target>User</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Working on Log Viewer
|
95,144 |
04.01.2020 14:42:23
| -3,600 |
a15c132c8eb4af8c921bad4d3f835cb002704328
|
Create monolog.yaml
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "config/packages/test/monolog.yaml",
"diff": "+monolog:\n+ channels: ['db']\n+ handlers:\n+ db:\n+ channels: ['db']\n+ type: service\n+ id: Bolt\\Log\\LogHandler\n\\ No newline at end of file\n"
}
] |
PHP
|
MIT License
|
bolt/core
|
Create monolog.yaml
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.