Skip to content

Commit

Permalink
Fix php version constraint
Browse files Browse the repository at this point in the history
  • Loading branch information
maukoese committed Oct 13, 2024
1 parent ae347f2 commit 5f23624
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<a href="https://styleci.io/repos/48796179">
<img src="https://styleci.io/repos/48796179/shield" alt="StyleCI">
</a>
<a href="https://packagist.org/packages/encore/laravel-admin">
<img src="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000&&style=flat-square" alt="Packagist">
<a href="https://packagist.org/packages/osenco/laravel-admin">
<img src="https://img.shields.io/packagist/l/osenco/laravel-admin.svg?maxAge=2592000&&style=flat-square" alt="Packagist">
</a>
<a href="https://packagist.org/packages/encore/laravel-admin">
<img src="https://img.shields.io/packagist/dt/encore/laravel-admin.svg?style=flat-square" alt="Total Downloads">
<a href="https://packagist.org/packages/osenco/laravel-admin">
<img src="https://img.shields.io/packagist/dt/osenco/laravel-admin.svg?style=flat-square" alt="Total Downloads">
</a>
<a href="https://github.com/z-song/laravel-admin">
<img src="https://img.shields.io/badge/Awesome-Laravel-brightgreen.svg?style=flat-square" alt="Awesome Laravel">
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions docs/en/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/en/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` 是一个可以快速帮你构建后台管理的工具,它提供的页面组件和表单元素等功能,能帮助你使用很少的代码就实现功能完善的后台管理功能。

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
首先确保安装好了`laravel`,并且数据库连接设置正确。

```
composer require encore/laravel-admin "1.5.*"
composer require osenco/laravel-admin "1.5.*"
```

然后运行下面的命令来发布资源:
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/qa.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`中,注意备份原来已经修改过的视图。

## 设置语言

Expand Down
2 changes: 1 addition & 1 deletion src/Console/ConfigCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Console/stubs/extension/composer.json.stub
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5f23624

Please sign in to comment.