Skip to content

Commit

Permalink
Merge pull request #237 from dragomano/develop
Browse files Browse the repository at this point in the history
Update to 2.7.0
  • Loading branch information
dragomano authored Jun 13, 2024
2 parents fa631d9 + 94cea84 commit 32c376e
Show file tree
Hide file tree
Showing 372 changed files with 7,437 additions and 5,424 deletions.
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ tab_width = 4
trim_trailing_whitespace = true
charset = utf-8

[*.js]
indent_style = space
indent_size = 2

[*.vue]
[*.{js,css,scss,vue,json}]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ In any case, the title of each of your commits should continue such a phrase —

### PHP Styleguide

- Use [PHP 8.0+](https://smknstd.github.io/modern-php-cheatsheet/) with tabs instead of spaces
- Use [PHP 8.1+](https://smknstd.github.io/modern-php-cheatsheet/) with tabs instead of spaces

```php
/**
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
[![SMF 3.0 Alpha](https://img.shields.io/badge/SMF-3.0_Alpha-ed2533.svg?style=flat)](https://github.com/SimpleMachines/SMF/tree/release-3.0)
![License](https://img.shields.io/github/license/dragomano/light-portal)
![Hooks only: Yes](https://img.shields.io/badge/Hooks%20only-YES-blue)
![PHP](https://img.shields.io/badge/PHP-^8.0-blue.svg?style=flat)
![PHP](https://img.shields.io/badge/PHP-^8.1-blue.svg?style=flat)
[![Crowdin](https://badges.crowdin.net/light-portal/localized.svg)](https://crowdin.com/project/light-portal)
[![](https://img.shields.io/badge/Demo-Forum-brightgreen.svg)](https://demo.dragomano.ru)
[![](https://img.shields.io/badge/Docs-Site-orange.svg)](https://dragomano.github.io/Light-Portal/)

- **Tested on:** PHP 8.0.30, 8.1.27, 8.2.16, 8.3.3 / MariaDB 10.11.6
- **Tested on:** 8.1.28 / MariaDB 11.2.2
- **Languages:** Russian, English, Polish, Spanish, French, Turkish, Ukrainian, German, Italian, Portuguese, Greek, Czech, Danish, Dutch, Norwegian, Swedish, Arabic

## Description ([обзор на русском](https://dragomano.ru/mods/light-portal))
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source_file=src/package-info.xml
integration_file=src/Sources/LightPortal/Integration.php
integration_file=src/Sources/LightPortal/Hooks/Init.php
version_search_pattern=(<version>)(.*?)(<\/version>)
version_replace_pattern=<version>${release.version}</version>
6 changes: 6 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@
<exclude name="Sources/LightPortal/Addons/Uicons/**" />
<exclude name="Sources/LightPortal/Addons/VkComments/**" />
<exclude name="Sources/LightPortal/Addons/YandexTurbo/**" />
<exclude name="Sources/LightPortal/config/development.config.php" />
<exclude name="Sources/LightPortal/composer.json" />
<exclude name="Sources/LightPortal/composer.lock" />
<exclude name="Sources/LightPortal/create_index.php" />
<exclude name="Sources/LightPortal/update_plugins.php" />
<include name="package-info.xml" />
<include name="*.php" />
</fileset>
Expand Down Expand Up @@ -123,9 +125,13 @@
<include name="Sources/**" />
<exclude name="Sources/index.php" />
<exclude name="Sources/LightPortal/Addons/**" />
<exclude name="Sources/LightPortal/Compilers/Less.php" />
<exclude name="Sources/LightPortal/Compilers/Sass.php" />
<exclude name="Sources/LightPortal/config/development.config.php" />
<exclude name="Sources/LightPortal/composer.json" />
<exclude name="Sources/LightPortal/composer.lock" />
<exclude name="Sources/LightPortal/create_index.php" />
<exclude name="Sources/LightPortal/update_plugins.php" />
<include name="package-info.xml" />
<include name="*.php" />
</fileset>
Expand Down
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@
}
},
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-dom": "*"
},
"require-dev": {
"rector/rector": "^1.0",
"phing/phing": "3.*"
},
"minimum-stability": "alpha",
"config": {
"platform": {
"php": "8.1"
}
},
"scripts": {
"check": "vendor/bin/rector process --dry-run --clear-cache",
"assets": [
Expand Down
8 changes: 4 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"devDependencies": {
"@nolebase/vitepress-plugin-enhanced-readabilities": "2.0.0-rc10",
"@nolebase/vitepress-plugin-enhanced-readabilities": "2.1.1",
"release-timeline": "^0.6.0",
"sass": "^1.75.0",
"vitepress": "^1.1.4",
"vitepress-sidebar": "^1.22.0"
"sass": "^1.77.5",
"vitepress": "^1.2.3",
"vitepress-sidebar": "^1.23.2"
},
"scripts": {
"docs:dev": "vitepress dev",
Expand Down
Loading

0 comments on commit 32c376e

Please sign in to comment.