Skip to content

Commit

Permalink
shorten namespace and remove unnecessary facade
Browse files Browse the repository at this point in the history
  • Loading branch information
Dilee committed May 14, 2023
1 parent 35a4ea3 commit 4e892aa
Show file tree
Hide file tree
Showing 18 changed files with 57 additions and 74 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://github.com/dilee/laravel-vietnamese-administrative-units/discussions/new?category=q-a
url: https://github.com/dileedotdev/laravel-vietnamese-administrative-units/discussions/new?category=q-a
about: Ask the community for help
- name: Request a feature
url: https://github.com/dilee/laravel-vietnamese-administrative-units/discussions/new?category=ideas
url: https://github.com/dileedotdev/laravel-vietnamese-administrative-units/discussions/new?category=ideas
about: Share ideas for new features
- name: Report a security issue
url: https://github.com/dilee/laravel-vietnamese-administrative-units/security/policy
url: https://github.com/dileedotdev/laravel-vietnamese-administrative-units/security/policy
about: Learn how to notify us for sensitive bugs
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# A Laravel package for interacting with Vietnamese administrative units

[![Latest Version on Packagist](https://img.shields.io/packagist/v/dilee/laravel-vietnamese-administrative-units.svg?style=flat-square)](https://packagist.org/packages/dilee/laravel-vietnamese-administrative-units)
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/dilee/laravel-vietnamese-administrative-units/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/dilee/laravel-vietnamese-administrative-units/actions?query=workflow%3Arun-tests+branch%3Amain)
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/dilee/laravel-vietnamese-administrative-units/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/dilee/laravel-vietnamese-administrative-units/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
[![Total Downloads](https://img.shields.io/packagist/dt/dilee/laravel-vietnamese-administrative-units.svg?style=flat-square)](https://packagist.org/packages/dilee/laravel-vietnamese-administrative-units)
[![Latest Version on Packagist](https://img.shields.io/packagist/v/dileedotdev/laravel-vietnamese-administrative-units.svg?style=flat-square)](https://packagist.org/packages/dileedotdev/laravel-vietnamese-administrative-units)
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/dileedotdev/laravel-vietnamese-administrative-units/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/dileedotdev/laravel-vietnamese-administrative-units/actions?query=workflow%3Arun-tests+branch%3Amain)
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/dileedotdev/laravel-vietnamese-administrative-units/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/dileedotdev/laravel-vietnamese-administrative-units/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
[![Total Downloads](https://img.shields.io/packagist/dt/dileedotdev/laravel-vietnamese-administrative-units.svg?style=flat-square)](https://packagist.org/packages/dileedotdev/laravel-vietnamese-administrative-units)

This is where your description should go. Limit it to a paragraph or two. Consider adding a small example.

Expand All @@ -12,7 +12,7 @@ This is where your description should go. Limit it to a paragraph or two. Consid
You can install the package via composer:

```bash
composer require dilee/laravel-vietnamese-administrative-units
composer require dileedotdev/laravel-vietnamese-administrative-units
```

You should publish and run the migrations with:
Expand All @@ -33,17 +33,17 @@ This is the contents of the published config file:
```php
return [
'province' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\Province::class,
'model' => \VietnameseAdministrativeUnits\Models\Province::class,
'table' => 'provinces',
],

'district' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\District::class,
'model' => \VietnameseAdministrativeUnits\Models\District::class,
'table' => 'districts',
],

'ward' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\Ward::class,
'model' => \VietnameseAdministrativeUnits\Models\Ward::class,
'table' => 'wards',
],
];
Expand Down Expand Up @@ -76,7 +76,7 @@ If you wonder where the CSV file comes from, you can find it [here](https://www.
You can use the models as usual:

```php
use Dilee\VietnameseAdministrativeUnits\Models\Ward;
use VietnameseAdministrativeUnits\Models\Ward;

class YourModel {
public function ward()
Expand Down Expand Up @@ -107,9 +107,9 @@ return new class extends Migration
Below is some useful code:

```php
use Dilee\VietnameseAdministrativeUnits\Models\Province;
use Dilee\VietnameseAdministrativeUnits\Models\District;
use Dilee\VietnameseAdministrativeUnits\Models\Ward;
use VietnameseAdministrativeUnits\Models\Province;
use VietnameseAdministrativeUnits\Models\District;
use VietnameseAdministrativeUnits\Models\Ward;

// Get all provinces
Province::all();
Expand Down Expand Up @@ -155,7 +155,7 @@ Please review [our security policy](../../security/policy) on how to report secu

## Credits

- [Dilee](https://github.com/dileedotdev)
- [Dileedotdev](https://github.com/dileedotdev)
- [All Contributors](../../contributors)

## License
Expand Down
19 changes: 9 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"name": "dilee/laravel-vietnamese-administrative-units",
"name": "dileedotdev/laravel-vietnamese-administrative-units",
"description": "A Laravel package for interacting with Vietnamese administrative units",
"keywords": [
"dilee",
"laravel",
"dilee.dev",
"dileedotdev",
"laravel-vietnamese-administrative-units",
"administrative-units"
],
"homepage": "https://github.com/dilee/laravel-vietnamese-administrative-units",
"homepage": "https://github.com/dileedotdev/laravel-vietnamese-administrative-units",
"license": "MIT",
"authors": [
{
Expand Down Expand Up @@ -37,13 +39,13 @@
},
"autoload": {
"psr-4": {
"Dilee\\VietnameseAdministrativeUnits\\": "src/",
"Dilee\\VietnameseAdministrativeUnits\\Database\\Factories\\": "database/factories/"
"VietnameseAdministrativeUnits\\": "src/",
"VietnameseAdministrativeUnits\\Database\\Factories\\": "database/factories/"
}
},
"autoload-dev": {
"psr-4": {
"Dilee\\VietnameseAdministrativeUnits\\Tests\\": "tests/"
"VietnameseAdministrativeUnits\\Tests\\": "tests/"
}
},
"scripts": {
Expand All @@ -63,11 +65,8 @@
"extra": {
"laravel": {
"providers": [
"Dilee\\VietnameseAdministrativeUnits\\VietnameseAdministrativeUnitsServiceProvider"
],
"aliases": {
"VietnameseAdministrativeUnits": "Dilee\\VietnameseAdministrativeUnits\\Facades\\VietnameseAdministrativeUnits"
}
"VietnameseAdministrativeUnits\\VietnameseAdministrativeUnitsServiceProvider"
]
}
},
"minimum-stability": "dev",
Expand Down
8 changes: 4 additions & 4 deletions config/vietnamese-administrative-units.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

// config for Dilee/VietnameseAdministrativeUnits
// config for dileedotdev/laravel-vietnamese-administrative-units package
return [
'province' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\Province::class,
'model' => \VietnameseAdministrativeUnits\Models\Province::class,
'table' => 'provinces',
],

'district' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\District::class,
'model' => \VietnameseAdministrativeUnits\Models\District::class,
'table' => 'districts',
],

'ward' => [
'model' => \Dilee\VietnameseAdministrativeUnits\Models\Ward::class,
'model' => \VietnameseAdministrativeUnits\Models\Ward::class,
'table' => 'wards',
],
];
6 changes: 3 additions & 3 deletions database/factories/DistrictFactory.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Database\Factories;
namespace VietnameseAdministrativeUnits\Database\Factories;

use Illuminate\Database\Eloquent\Factories\Factory;

class DistrictFactory extends Factory
{
protected $model = \Dilee\VietnameseAdministrativeUnits\Models\District::class;
protected $model = \VietnameseAdministrativeUnits\Models\District::class;

public function definition()
{
return [
'code' => $this->faker->unique()->randomNumber(2),
'name' => $this->faker->unique()->words(asText: true),
'province_id' => \Dilee\VietnameseAdministrativeUnits\Models\Province::factory(),
'province_id' => \VietnameseAdministrativeUnits\Models\Province::factory(),
];
}
}
4 changes: 2 additions & 2 deletions database/factories/ProvinceFactory.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Database\Factories;
namespace VietnameseAdministrativeUnits\Database\Factories;

use Illuminate\Database\Eloquent\Factories\Factory;

class ProvinceFactory extends Factory
{
protected $model = \Dilee\VietnameseAdministrativeUnits\Models\Province::class;
protected $model = \VietnameseAdministrativeUnits\Models\Province::class;

public function definition()
{
Expand Down
6 changes: 3 additions & 3 deletions database/factories/WardFactory.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Database\Factories;
namespace VietnameseAdministrativeUnits\Database\Factories;

use Illuminate\Database\Eloquent\Factories\Factory;

class WardFactory extends Factory
{
protected $model = \Dilee\VietnameseAdministrativeUnits\Models\Ward::class;
protected $model = \VietnameseAdministrativeUnits\Models\Ward::class;

public function definition()
{
return [
'code' => $this->faker->unique()->randomNumber(2),
'name' => $this->faker->unique()->words(asText: true),
'district_id' => \Dilee\VietnameseAdministrativeUnits\Models\District::factory(),
'district_id' => \VietnameseAdministrativeUnits\Models\District::factory(),
];
}
}
8 changes: 4 additions & 4 deletions src/Commands/ImportationCommand.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Commands;
namespace VietnameseAdministrativeUnits\Commands;

use Dilee\VietnameseAdministrativeUnits\Models\District;
use Dilee\VietnameseAdministrativeUnits\Models\Province;
use Dilee\VietnameseAdministrativeUnits\Models\Ward;
use Illuminate\Console\Command;
use Spatie\SimpleExcel\SimpleExcelReader;
use VietnameseAdministrativeUnits\Models\District;
use VietnameseAdministrativeUnits\Models\Province;
use VietnameseAdministrativeUnits\Models\Ward;

class ImportationCommand extends Command
{
Expand Down
16 changes: 0 additions & 16 deletions src/Facades/VietnameseAdministrativeUnits.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Models/District.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Models;
namespace VietnameseAdministrativeUnits\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Province.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Models;
namespace VietnameseAdministrativeUnits\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Ward.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Models;
namespace VietnameseAdministrativeUnits\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
Expand Down
2 changes: 1 addition & 1 deletion src/VietnameseAdministrativeUnits.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits;
namespace VietnameseAdministrativeUnits;

class VietnameseAdministrativeUnits
{
Expand Down
4 changes: 2 additions & 2 deletions src/VietnameseAdministrativeUnitsServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits;
namespace VietnameseAdministrativeUnits;

use Dilee\VietnameseAdministrativeUnits\Commands\ImportationCommand;
use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;
use VietnameseAdministrativeUnits\Commands\ImportationCommand;

class VietnameseAdministrativeUnitsServiceProvider extends PackageServiceProvider
{
Expand Down
6 changes: 3 additions & 3 deletions tests/ImportationCommandTest.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

use Dilee\VietnameseAdministrativeUnits\Models\District;
use Dilee\VietnameseAdministrativeUnits\Models\Province;
use Dilee\VietnameseAdministrativeUnits\Models\Ward;
use function Pest\Laravel\assertDatabaseCount;
use Spatie\SimpleExcel\SimpleExcelReader;
use Spatie\TestTime\TestTime;
use VietnameseAdministrativeUnits\Models\District;
use VietnameseAdministrativeUnits\Models\Province;
use VietnameseAdministrativeUnits\Models\Ward;

it('includes enough provinces, districts and wards', function () {
$filePath = __DIR__.'/../assets/vietnamese-administrative-units.csv';
Expand Down
6 changes: 3 additions & 3 deletions tests/ModelTest.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use Dilee\VietnameseAdministrativeUnits\Models\District;
use Dilee\VietnameseAdministrativeUnits\Models\Province;
use Dilee\VietnameseAdministrativeUnits\Models\Ward;
use function Pest\Laravel\assertDatabaseCount;
use VietnameseAdministrativeUnits\Models\District;
use VietnameseAdministrativeUnits\Models\Province;
use VietnameseAdministrativeUnits\Models\Ward;

it('relationships are working', function () {
Ward::factory()->count(10)->create();
Expand Down
2 changes: 1 addition & 1 deletion tests/Pest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Dilee\VietnameseAdministrativeUnits\Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
use VietnameseAdministrativeUnits\Tests\TestCase;

uses(TestCase::class, RefreshDatabase::class)->in(__DIR__);
6 changes: 3 additions & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Dilee\VietnameseAdministrativeUnits\Tests;
namespace VietnameseAdministrativeUnits\Tests;

use Dilee\VietnameseAdministrativeUnits\VietnameseAdministrativeUnitsServiceProvider;
use Illuminate\Database\Eloquent\Factories\Factory;
use Orchestra\Testbench\TestCase as Orchestra;
use VietnameseAdministrativeUnits\VietnameseAdministrativeUnitsServiceProvider;

class TestCase extends Orchestra
{
Expand All @@ -13,7 +13,7 @@ protected function setUp(): void
parent::setUp();

Factory::guessFactoryNamesUsing(
fn (string $modelName) => 'Dilee\\VietnameseAdministrativeUnits\\Database\\Factories\\'.class_basename($modelName).'Factory'
fn (string $modelName) => 'VietnameseAdministrativeUnits\\Database\\Factories\\'.class_basename($modelName).'Factory'
);
}

Expand Down

0 comments on commit 4e892aa

Please sign in to comment.