Skip to content

Commit 6fd757f

Browse files
committed
Update bolt to 4.1.18
1 parent 29c517f commit 6fd757f

26 files changed

+2113
-1902
lines changed

bin/post-create-project.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
if (!file_exists('.env')) {
4+
copy('.env.dist', '.env');
5+
}
6+
7+
if (file_exists('public/.gitignore')) {
8+
unlink('public/.gitignore');
9+
}
10+
11+
if (file_exists('README_project.md')) {
12+
rename('README_project.md', 'README.md');
13+
}
14+

composer.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
2+
"name": "bolt/project",
23
"type": "project",
3-
"license": "proprietary",
4+
"description": "Bolt 4 standard project skeleton",
5+
"license": "MIT",
46
"require": {
5-
"bobdenotter/weatherwidget": "^1.0",
6-
"bolt/assets": "^4.0",
7-
"bolt/core": "dev-master",
8-
"bolt/newswidget": "^1.1",
9-
"bolt/themes": "^3.1",
7+
"bobdenotter/configuration-notices": "^1.0",
8+
"bolt/assets": "^4.1",
9+
"bolt/core": "^4.1",
10+
"bolt/themes": "^3.3",
1011
"symfony/flex": "^1.6"
1112
},
1213
"autoload": {
1314
"psr-4": {
1415
"App\\": "src/"
1516
}
1617
},
17-
"minimum-stability": "dev",
18+
"minimum-stability": "stable",
1819
"prefer-stable": true,
1920
"scripts": {
2021
"auto-scripts": {
@@ -35,9 +36,6 @@
3536
"@auto-scripts",
3637
"php bin/console extensions:configure",
3738
"php bin/console bolt:info"
38-
],
39-
"periodical-tasks": [
40-
"security-checker security:check"
4139
]
4240
},
4341
"extra": {

composer.lock

Lines changed: 1943 additions & 1737 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/bolt/config.yaml

Lines changed: 75 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ locale: en
2929
# settings, see: http://php.net/manual/en/timezones.php
3030
# timezone: UTC
3131

32-
# Set maintenance mode on or off.
33-
#
34-
# The default for the Maintenance mode (503) page. Can be an (array of) template
35-
# names or identifiers for records, which will be tried until a match is found.
36-
maintenance_mode: false
37-
maintenance: [ blocks/503-maintenance-mode, 'helpers/page_503.html.twig' ]
32+
# Set the default time format used on this website. For a list of valid date
33+
# format settings, see: https://www.php.net/manual/en/function.date.php
34+
date_format: 'F j, Y H:i'
3835

3936
# If your site is reachable under different urls (say, both blog.example.org/
4037
# as well as example.org/), its a good idea to set one of these as the
@@ -60,10 +57,29 @@ maintenance: [ blocks/503-maintenance-mode, 'helpers/page_503.html.twig' ]
6057
homepage: homepage/22
6158
homepage_template: index.twig
6259

63-
# The default content for the 404 page. Can be an (array of) template names or
64-
# identifiers for records, which will be tried until a match is found.
60+
# The default content for the "Not Found" (404) page. Can be an (array of) template
61+
# names or identifiers for records, which will be tried until a match is found.
6562
notfound: [ blocks/404-not-found, 'helpers/page_404.html.twig' ]
6663

64+
# Toggle maintenance mode on or off. Note: If you're logged in, you'll still see
65+
# the website as usual. Use an incognito window to see the "maintenance" page.
66+
maintenance_mode: false
67+
68+
# The default for the "Maintenance mode" (503) page. Can be an (array of) template
69+
# names or identifiers for records, which will be tried until a match is found.
70+
maintenance: [ blocks/503-maintenance-mode, 'helpers/page_503.html.twig' ]
71+
72+
# The default content for the "Forbidden" (403) page. Can be an (array of) template
73+
# names or identifiers for records, which will be tried until a match is found.
74+
forbidden: [ blocks/403-forbidden, 'helpers/page_403.html.twig' ]
75+
76+
# The default content for the "Internal Server Error" (500) page. Can be an
77+
# (array of) template names or identifiers for records.
78+
# Note: Only used in `APP_ENV=prod` mode. You're advised to keep this as simple
79+
# as possible, because if an error occurs in this template, it can not be
80+
# handled, and you'll have a bad time debugging it!
81+
internal_server_error: [ 'helpers/page_500.html.twig' ]
82+
6783
# The default template and amount of records to use for listing-pages on the
6884
# site.
6985
#
@@ -80,27 +96,22 @@ record_template: record.twig
8096
#
8197
# Can be overridden for each content type.
8298
#
83-
# Note 1: Sorting on TAXONOMY-pages will give unexpected results, if it has a
84-
# pager.
85-
# If you need sorting on those, make sure you display all the records on one
86-
# page.
87-
#
88-
# Note 2: If you've changed the filename, and your changes do not show up on the
99+
# Note: If you've changed the filename, and your changes do not show up on the
89100
# website, be sure to check for a config.yaml file in your themes
90101
# folder. If a template is set there, it will override the setting here.
91102
listing_template: listing.twig
92103
listing_records: 6
93104
listing_sort: datepublish DESC
94105

106+
# Allow filtering on listing pages using query parameters, much like you would
107+
# with {% setcontent %}. E.g. /pages?order=id and /pages?title--like=voluptat
108+
# Useful for search.
109+
query_search: true
110+
95111
# Maximum amount of items to show in a `<select>` for picking a record. For
96112
# example in `type: select`.
97113
maximum_listing_select: 1000
98114

99-
# Because of limitations on how the underlying database queries work, there are
100-
# only two options for sorting on taxonomies. ASC for roughly "oldest first"
101-
# and DESC for roughly newest first.
102-
taxonomy_sort: DESC
103-
104115
# Template for showing the search results. If not defined, uses the settings for
105116
# listing_template and listing_records.
106117
#
@@ -114,6 +125,36 @@ search_results_records: 10
114125
# for each content type.
115126
records_per_page: 8
116127

128+
# Default settings for thumbnails.
129+
#
130+
# quality: Quality should be between 0 (horrible, small file) and 100 (best, huge file).
131+
# fit: One of either none, crop (= crop-center), crop-top-left, crop-top, crop-top-right, crop-left, crop-right, crop-bottom-left, crop-bottom or crop-bottom-right.
132+
# allow_upscale: Determines whether small images will be enlarged to fit
133+
# the requested dimensions.
134+
# save_files: Save files in the thumbs/ folder, so subsequent requests will serve file directly. Great for performance
135+
#
136+
# Note: If you change these values, you might need to clear the cache before
137+
# they show up.
138+
thumbnails:
139+
default_thumbnail: [ 320, 240 ]
140+
default_image: [ 1000, 750 ]
141+
quality: 80
142+
cropping: crop
143+
save_files: true
144+
allow_upscale: false
145+
146+
# File permissions for read/write/execute to set on folders and files that are
147+
# created. The exact permissions you should be setting depends on the system
148+
# user that PHP (and/or your webserver) is running as, and the user who owns the
149+
# actual folders/files.
150+
#
151+
# - If they are the same user, use `0o755` for folders and `0o644` for files.
152+
# - If they're in the same group, use use `0o775` for folders and `0o664` for files.
153+
# - If you don't know, or you can't make it work otherwise, then use `0o777` for folders and `0o666` for files.
154+
filepermissions:
155+
folders: 0o775
156+
files: 0o664
157+
117158
# Define the HTML tags and attributes that are allowed in cleaned HTML. This
118159
# is used for sanitizing HTML, to make sure there are no undesirable elements
119160
# left in the content that is shown to users. For example, tags like `<script>`
@@ -124,62 +165,26 @@ records_per_page: 8
124165
htmlcleaner:
125166
allowed_tags: [ div, span, p, br, hr, s, u, strong, em, i, b, li, ul, ol, mark, blockquote, pre, code, tt, h1, h2, h3, h4, h5, h6, dd, dl, dt, table, tbody, thead, tfoot, th, td, tr, a, img, address, abbr, iframe, caption, sub, super, figure, figcaption ]
126167
allowed_attributes: [ id, class, style, name, value, href, src, alt, title, width, height, frameborder, allowfullscreen, scrolling, target, colspan, rowspan ]
168+
allowed_frame_targets: [ _blank, _self, _parent, _top ]
127169

128170
# Define the file types (extensions to be exact) that are acceptable for upload
129171
# in either file fields or through the files screen.
130-
accept_file_types: [ twig, html, js, css, scss, gif, jpg, jpeg, png, ico, zip, tgz, txt, md, doc, docx, pdf, epub, xls, xlsx, ppt, pptx, mp3, ogg, wav, m4a, mp4, m4v, ogv, wmv, avi, webm, svg]
172+
accept_file_types: [ twig, html, js, css, scss, gif, jpg, jpeg, png, ico, zip, tgz, txt, md, doc, docx, pdf, epub, xls, xlsx, ppt, pptx, mp3, ogg, wav, m4a, mp4, m4v, ogv, wmv, avi, webm, svg, webp, avif]
131173

132174
# Alternatively, if you wish to limit these, uncomment the following list
133175
# instead. It just includes file types / extensions that are harder to exploit.
134-
# accept_file_types: [ gif, jpg, jpeg, png, txt, md, pdf, epub, mp3, svg ]
176+
# accept_file_types: [ gif, jpg, jpeg, png, txt, md, pdf, epub, mp3 ]
135177

136-
accept_media_types: [ gif, jpg, jpeg, png, svg, pdf, mp3, tiff ]
178+
accept_media_types: [ gif, jpg, jpeg, png, svg, pdf, mp3, tiff, avif, webp ]
137179

138-
# If you want to brand the Bolt backend for a client, you can change some key
139-
# variables here, that determine the name of the backend, and adds a primary
140-
# support/contact link to the footer. Add a scheme, like `mailto:` or
141-
# `https://` to the email or URL.
142-
#
143-
# Additionally you can change the mount point for the backend, either for
144-
# convenience or to obscure it from prying eyes.
145-
#
146-
# The Bolt backend is accessible as `/bolt/` by default. If you change it here,
147-
# it will only be accessible through the value set in path.
148-
# Keep the path simple: lowercase only, no extra slashes or other special
149-
# characters.
150-
# branding:
151-
# name: SuperCMS
152-
# path: /admin
153-
# provided_by: [ [email protected], "Supercool Webdesign Co." ]
154-
155-
# There are several options for giving editors more options to insert images,
156-
# video, etc in the WYSIWYG areas. But, as you give them more options, that
157-
# means they also have more ways of breaking the preciously designed layout.
158-
#
159-
# By default the most dangerous options are set to false. If you choose to
160-
# enable them for your editors, please instruct them thoroughly on their
161-
# responsibility not to break the layout.
162-
wysiwyg:
163-
images: false # Allow users to insert images in the content.
164-
anchor: false # Adds a button to create internal anchors to link to.
165-
tables: false # Adds a button to insert and modify tables in the content.
166-
fontcolor: false # Allow users to mess around with font coloring.
167-
align: false # Adds buttons for align left, align right, etc.
168-
subsuper: false # Adds buttons for subscript and superscript, using `<sub>` and `<sup>`.
169-
embed: false # Allows the user to insert embedded videos from Youtube, Vimeo, etc.
170-
underline: false # Adds a button to underline text, using the `<u>`-tag.
171-
ruler: false # Adds a button to add a horizontal ruler, using the `<hr>`-tag.
172-
strike: false # Adds a button to add stikethrough, using the `<s>`-tag.
173-
blockquote: false # Allows the user to insert blockquotes using the `<blockquote>`-tag.
174-
codesnippet: false # Allows the user to insert code snippets using `<pre><code>`-tags.
175-
specialchar: false # Adds a button to insert special chars like € or ™.
176-
clipboard: false # Adds buttons to undo and redo.
177-
copypaste: false # Adds buttons to cut, copy and paste.
178-
ck:
179-
autoParagraph: true # If set to true, any pasted content is wrapped in `<p>`-tags for multiple line-breaks
180-
disableNativeSpellChecker: true # If set to true it will stop browsers from underlining spelling mistakes
181-
allowNbsp: false # If set to false, the editor will strip out `&nbsp;` characters. If set to true, it will allow them. ¯\_(ツ)_/¯
182-
183-
# Enforcing the use of SSL. If set, all pages will enforce an SSL connection,
184-
# and redirect to HTTPS if you attempt to visit plain HTTP pages.
185-
# enforce_ssl: true
180+
# Set the maximum upload size. Note, this can never exceed the settings for
181+
#`post_max_size` and `upload_max_filesize` in `php.ini`.
182+
accept_upload_size: 8M
183+
184+
# Default location for uploading files.
185+
upload_location: "{contenttype}/{year}/{month}/"
186+
187+
# Options to use with curl requests.
188+
# For all options, check the official curl documentation here https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
189+
curl_options:
190+
verify_peer: true

config/bolt/taxonomy.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ tags:
88
postfix: "Add some freeform tags. Start a new tag by typing a comma or space."
99
allow_spaces: false
1010
#listing_template: tag-listing.twig #custom template
11+
required: false
1112

1213
groups:
1314
slug: groups
1415
singular_slug: group
1516
behaves_like: grouping
1617
options: { main: "The main group", meta: "Meta group", other: "The other stuff" }
1718
has_sortorder: true
19+
required: false
1820

1921
categories:
2022
name: Categories
@@ -24,3 +26,4 @@ categories:
2426
behaves_like: categories
2527
multiple: true
2628
options: [ news, events, movies, music, books, life, love, fun ]
29+
required: false

config/packages/dev/security_checker.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

config/packages/doctrine.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ doctrine:
2020

2121
orm:
2222
auto_generate_proxy_classes: '%kernel.debug%'
23-
naming_strategy: doctrine.orm.naming_strategy.underscore
23+
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
2424
auto_mapping: true
2525
mappings:
2626
App:
@@ -38,7 +38,8 @@ doctrine:
3838
dql:
3939
string_functions:
4040
JSON_EXTRACT: Bolt\Doctrine\Functions\JsonExtract
41-
CAST: DoctrineExtensions\Query\Mysql\Cast
41+
JSON_GET_TEXT: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Postgresql\JsonGetText
42+
CAST: Bolt\Doctrine\Query\Cast
4243
numeric_functions:
4344
RAND: Bolt\Doctrine\Functions\Rand
4445

config/packages/twig.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ twig:
77
paths:
88
# Since the name of the theme folder is dynamic, we shouldn't set it here, but dynamically
99
# See TwigAwareController::setTwigLoader()
10-
# '%kernel.project_dir%/public/theme/%bolt.theme%': ''
10+
11+
# The following line is commented out by default (for now), because enabling it
12+
# breaks the installation process: It breaks because `base-2021` isn't copied yet,
13+
# and the command to copy `base-2021` breaks, because the folder doesn't exist yet.
14+
# @see: https://github.com/bolt/project/pull/37
15+
# '%kernel.project_dir%/public/theme/%bolt.theme%': 'theme'
16+
1117
'%kernel.project_dir%/vendor/bolt/core/templates/': 'bolt'
1218
default_path: '%kernel.project_dir%/vendor/bolt/core/templates'
1319
globals:

config/services.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ services:
6161
tags:
6262
- { name: doctrine.event_listener, event: loadClassMetadata }
6363

64+
Bolt\Event\Listener\TaxonomyFillListener:
65+
tags:
66+
- { name: doctrine.event_listener, event: postLoad }
67+
6468
Bolt\Extension\RoutesLoader:
6569
tags: [routing.loader]
6670

config/services_bolt.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ services:
77
App\:
88
resource: '../src/*'
99
exclude: '../src/{Entity,Exception}'
10-
BobdenOtter\WeatherWidget\:
11-
resource: '../vendor/bobdenotter/weatherwidget/src/*'
12-
exclude: '../vendor/bobdenotter/weatherwidget/src/{Entity,Exception}'
13-
Bolt\NewsWidget\:
14-
resource: '../vendor/bolt/newswidget/src/*'
15-
exclude: '../vendor/bolt/newswidget/src/{Entity,Exception}'
10+
BobdenOtter\ConfigurationNotices\:
11+
resource: '../vendor/bobdenotter/configuration-notices/src/*'
12+
exclude: '../vendor/bobdenotter/configuration-notices/src/{Entity,Exception}'

0 commit comments

Comments
 (0)