Edwin Noorlander
863661612a
### 🚀 New Features - **League CommonMark Integration**: Replaced basic Markdown parser with full CommonMark 2.7 support - **Bootstrap Sass Architecture**: Modern SCSS build system with Bootstrap 5.3.8 - **Enhanced Navigation**: Uses filenames instead of H1 titles for consistency - **Improved Styling**: Transparent navigation backgrounds, no rounded corners ### 🎨 UI/UX Improvements - Navigation items now use formatted filenames (e.g., "kennis-boven-aantallen" → "Kennis Boven Aantallen") - Transparent navigation backgrounds with subtle hover effects - Removed rounded corners from first-level navigation - 50% opacity navigation background using Bootstrap variables ### 🔧 Technical Improvements - **Class Organization**: Extracted CodePressCMS and SimpleTemplate to separate files - **Full PHPDoc Documentation**: Complete documentation for all methods - **Modern Build Process**: npm scripts for SCSS compilation - **Enhanced Markdown Support**: Tables, strikethrough, task lists, autolinks - **Security**: Proper HTML sanitization with CommonMark ### 📦 Dependencies - Added `league/commonmark` for professional Markdown parsing - Added `bootstrap` for SCSS-based styling - Updated `sass` build process ### 🐛 Bug Fixes - Fixed content directory path configuration - Resolved navigation title inconsistencies - Improved Markdown bold/italic formatting - Fixed homepage 404 issues ### 🔄 Migration Notes - Content directory moved from `content/` to `public/content/` - Navigation now displays filenames instead of content H1 titles - CSS now compiled from SCSS source files The CMS now provides a professional, modern experience with robust Markdown support and clean, maintainable code architecture.
87 lines
2.5 KiB
PHP
87 lines
2.5 KiB
PHP
<?php
|
|
|
|
/**
|
|
* This file is part of the Nette Framework (https://nette.org)
|
|
* Copyright (c) 2004 David Grudl (https://davidgrudl.com)
|
|
*/
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Nette\Utils;
|
|
|
|
use Nette;
|
|
use function defined, is_int, json_decode, json_encode, json_last_error, json_last_error_msg;
|
|
use const JSON_BIGINT_AS_STRING, JSON_FORCE_OBJECT, JSON_HEX_AMP, JSON_HEX_APOS, JSON_HEX_QUOT, JSON_HEX_TAG, JSON_OBJECT_AS_ARRAY, JSON_PRESERVE_ZERO_FRACTION, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE;
|
|
|
|
|
|
/**
|
|
* JSON encoder and decoder.
|
|
*/
|
|
final class Json
|
|
{
|
|
use Nette\StaticClass;
|
|
|
|
/** @deprecated use Json::decode(..., forceArrays: true) */
|
|
public const FORCE_ARRAY = JSON_OBJECT_AS_ARRAY;
|
|
|
|
/** @deprecated use Json::encode(..., pretty: true) */
|
|
public const PRETTY = JSON_PRETTY_PRINT;
|
|
|
|
/** @deprecated use Json::encode(..., asciiSafe: true) */
|
|
public const ESCAPE_UNICODE = 1 << 19;
|
|
|
|
|
|
/**
|
|
* Converts value to JSON format. Use $pretty for easier reading and clarity, $asciiSafe for ASCII output
|
|
* and $htmlSafe for HTML escaping, $forceObjects enforces the encoding of non-associateve arrays as objects.
|
|
* @throws JsonException
|
|
*/
|
|
public static function encode(
|
|
mixed $value,
|
|
bool|int $pretty = false,
|
|
bool $asciiSafe = false,
|
|
bool $htmlSafe = false,
|
|
bool $forceObjects = false,
|
|
): string
|
|
{
|
|
if (is_int($pretty)) { // back compatibility
|
|
$flags = ($pretty & self::ESCAPE_UNICODE ? 0 : JSON_UNESCAPED_UNICODE) | ($pretty & ~self::ESCAPE_UNICODE);
|
|
} else {
|
|
$flags = ($asciiSafe ? 0 : JSON_UNESCAPED_UNICODE)
|
|
| ($pretty ? JSON_PRETTY_PRINT : 0)
|
|
| ($forceObjects ? JSON_FORCE_OBJECT : 0)
|
|
| ($htmlSafe ? JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG : 0);
|
|
}
|
|
|
|
$flags |= JSON_UNESCAPED_SLASHES
|
|
| (defined('JSON_PRESERVE_ZERO_FRACTION') ? JSON_PRESERVE_ZERO_FRACTION : 0); // since PHP 5.6.6 & PECL JSON-C 1.3.7
|
|
|
|
$json = json_encode($value, $flags);
|
|
if ($error = json_last_error()) {
|
|
throw new JsonException(json_last_error_msg(), $error);
|
|
}
|
|
|
|
return $json;
|
|
}
|
|
|
|
|
|
/**
|
|
* Parses JSON to PHP value. The $forceArrays enforces the decoding of objects as arrays.
|
|
* @throws JsonException
|
|
*/
|
|
public static function decode(string $json, bool|int $forceArrays = false): mixed
|
|
{
|
|
$flags = is_int($forceArrays) // back compatibility
|
|
? $forceArrays
|
|
: ($forceArrays ? JSON_OBJECT_AS_ARRAY : 0);
|
|
$flags |= JSON_BIGINT_AS_STRING;
|
|
|
|
$value = json_decode($json, flags: $flags);
|
|
if ($error = json_last_error()) {
|
|
throw new JsonException(json_last_error_msg(), $error);
|
|
}
|
|
|
|
return $value;
|
|
}
|
|
}
|