From 5f23624f0540ccc453f8352494872c1680fa9e62 Mon Sep 17 00:00:00 2001 From: Mauko Maunde Date: Sun, 13 Oct 2024 03:52:48 +0300 Subject: [PATCH] Fix php version constraint --- README.md | 10 +++++----- composer.json | 2 +- docs/en/README.md | 6 +++--- docs/en/installation.md | 2 +- docs/zh/README.md | 4 ++-- docs/zh/installation.md | 2 +- docs/zh/qa.md | 4 ++-- src/Console/ConfigCommand.php | 2 +- src/Console/stubs/extension/composer.json.stub | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ea74e82ec4..5b048bc079 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ StyleCI - - Packagist + + Packagist - - Total Downloads + + Total Downloads Awesome Laravel @@ -63,7 +63,7 @@ Installation First, install laravel 5.5, and make sure that the database connection settings are correct. ``` -composer require encore/laravel-admin +composer require osenco/laravel-admin ``` Then run these commands to publish assets and config： diff --git a/composer.json b/composer.json index 173e9c894c..d26726002d 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ } ], "require": { - "php": ">=8.0.0", + "php": "^8.0.0", "symfony/dom-crawler": "^6.4|^7.0", "laravel/framework": "^11.0", "doctrine/dbal": "^4.0" diff --git a/docs/en/README.md b/docs/en/README.md index 699c7c5c89..037256961f 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -4,8 +4,8 @@ laravel-admin [![Build Status](https://travis-ci.org/z-song/laravel-admin.svg?branch=master)](https://travis-ci.org/z-song/laravel-admin) [![StyleCI](https://styleci.io/repos/48796179/shield)](https://styleci.io/repos/48796179) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/z-song/laravel-admin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/z-song/laravel-admin/?branch=master) -[![Packagist](https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000)](https://packagist.org/packages/encore/laravel-admin) -[![Total Downloads](https://img.shields.io/packagist/dt/encore/laravel-admin.svg?style=flat-square)](https://packagist.org/packages/encore/laravel-admin) +[![Packagist](https://img.shields.io/packagist/l/osenco/laravel-admin.svg?maxAge=2592000)](https://packagist.org/packages/osenco/laravel-admin) +[![Total Downloads](https://img.shields.io/packagist/dt/osenco/laravel-admin.svg?style=flat-square)](https://packagist.org/packages/osenco/laravel-admin) [![Awesome Laravel](https://img.shields.io/badge/Awesome-Laravel-brightgreen.svg)](https://github.com/z-song/laravel-admin) `laravel-admin` is administrative interface builder for laravel which can help you build CRUD backends just with few lines of code. @@ -29,7 +29,7 @@ Installation First, install laravel 5.5, and make sure that the database connection settings are correct. ``` -composer require encore/laravel-admin 1.5.* +composer require osenco/laravel-admin 1.5.* ``` Then run these commands to publish assets and config： diff --git a/docs/en/installation.md b/docs/en/installation.md index 3df0c7d699..666248563b 100644 --- a/docs/en/installation.md +++ b/docs/en/installation.md @@ -6,7 +6,7 @@ First, install laravel, and make sure that the database connection settings are Then install require this package with command: ``` -composer require encore/laravel-admin "1.5.*" +composer require osenco/laravel-admin "1.5.*" ``` Publish assets and config with command： diff --git a/docs/zh/README.md b/docs/zh/README.md index 3a27d7ec45..cc93df0b66 100644 --- a/docs/zh/README.md +++ b/docs/zh/README.md @@ -3,8 +3,8 @@ [![Build Status](https://travis-ci.org/z-song/laravel-admin.svg?branch=master)](https://travis-ci.org/z-song/laravel-admin) [![StyleCI](https://styleci.io/repos/48796179/shield)](https://styleci.io/repos/48796179) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/z-song/laravel-admin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/z-song/laravel-admin/?branch=master) -[![Packagist](https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000)](https://packagist.org/packages/encore/laravel-admin) -[![Total Downloads](https://img.shields.io/packagist/dt/encore/laravel-admin.svg?style=flat-square)](https://packagist.org/packages/encore/laravel-admin) +[![Packagist](https://img.shields.io/packagist/l/osenco/laravel-admin.svg?maxAge=2592000)](https://packagist.org/packages/osenco/laravel-admin) +[![Total Downloads](https://img.shields.io/packagist/dt/osenco/laravel-admin.svg?style=flat-square)](https://packagist.org/packages/osenco/laravel-admin) `laravel-admin` 是一个可以快速帮你构建后台管理的工具，它提供的页面组件和表单元素等功能，能帮助你使用很少的代码就实现功能完善的后台管理功能。 diff --git a/docs/zh/installation.md b/docs/zh/installation.md index 73d0f65958..87cfea24ae 100644 --- a/docs/zh/installation.md +++ b/docs/zh/installation.md @@ -5,7 +5,7 @@ 首先确保安装好了`laravel`，并且数据库连接设置正确。 ``` -composer require encore/laravel-admin "1.5.*" +composer require osenco/laravel-admin "1.5.*" ``` 然后运行下面的命令来发布资源： diff --git a/docs/zh/qa.md b/docs/zh/qa.md index c2614ed78e..3a90d162c2 100644 --- a/docs/zh/qa.md +++ b/docs/zh/qa.md @@ -4,13 +4,13 @@ 如果有需要自己修改view，但是不方便直接修改`laravel-admin`的情况，可以用下面的办法解决 -复制`vendor/encore/laravel-admin/views`到项目的`resources/views/admin`，然后在`app/Admin/bootstrap.php`文件中加入代码： +复制`vendor/osenco/laravel-admin/views`到项目的`resources/views/admin`，然后在`app/Admin/bootstrap.php`文件中加入代码： ```php app('view')->prependNamespace('admin', resource_path('views/admin')); ``` -这样就用`resources/views/admin`下的视图覆盖了`laravel-admin`的视图，要注意的问题是，更新`laravel-admin`的时候，如果遇到视图方面的问题，需要重新复制`vendor/encore/laravel-admin/views`到项目的`resources/views/admin`中，注意备份原来已经修改过的视图。 +这样就用`resources/views/admin`下的视图覆盖了`laravel-admin`的视图，要注意的问题是，更新`laravel-admin`的时候，如果遇到视图方面的问题，需要重新复制`vendor/osenco/laravel-admin/views`到项目的`resources/views/admin`中，注意备份原来已经修改过的视图。 ## 设置语言 diff --git a/src/Console/ConfigCommand.php b/src/Console/ConfigCommand.php index c49a2994bd..0b0b79b877 100644 --- a/src/Console/ConfigCommand.php +++ b/src/Console/ConfigCommand.php @@ -46,7 +46,7 @@ public function handle() $this->printDiff('Removed', $removed, true); $this->line(''); - $this->comment('Please open `vendor/encore/laravel-admin/config/admin.php` to check the difference'); + $this->comment('Please open `vendor/osenco/laravel-admin/config/admin.php` to check the difference'); } protected function diff(array $from, array $to) diff --git a/src/Console/stubs/extension/composer.json.stub b/src/Console/stubs/extension/composer.json.stub index 8eb68e9a16..e33c32c78c 100644 --- a/src/Console/stubs/extension/composer.json.stub +++ b/src/Console/stubs/extension/composer.json.stub @@ -13,7 +13,7 @@ ], "require": { "php": ">=7.0.0", - "encore/laravel-admin": "~1.6" + "osenco/laravel-admin": "~1.6" }, "require-dev": { "phpunit/phpunit": "~6.0"