Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to astrotomic #1

Merged
merged 3 commits into from
Jun 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ build:
version: 7.3.0
dependencies:
before:
- sudo composer self-update
- mysql -e 'create database translatable_test;'
- echo "CREATE USER 'homestead'@'localhost' IDENTIFIED BY 'secret'; \n GRANT ALL PRIVILEGES ON * . * TO 'homestead'@'localhost'; \nFLUSH PRIVILEGES; \n" | mysql -u root
- command: 'composer install --prefer-dist'
idle_timeout: 1200
- mysql -e 'create database translatable_test;'
- echo "CREATE USER 'homestead'@'localhost' IDENTIFIED BY 'secret'; \n GRANT ALL PRIVILEGES ON * . * TO 'homestead'@'localhost'; \nFLUSH PRIVILEGES; \n" | mysql -u root
tests:
override:
- command: echo 1
- command: echo 1

tools:
external_code_coverage:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"autoload": {
"psr-4": {
"Dimsav\\Translatable\\": "src/Translatable/"
"Astrotomic\\Translatable\\": "src/Translatable/"
}
},
"autoload-dev": {
Expand All @@ -40,7 +40,7 @@
"extra": {
"laravel": {
"providers": [
"Dimsav\\Translatable\\TranslatableServiceProvider"
"Astrotomic\\Translatable\\TranslatableServiceProvider"
]
}
},
Expand Down
14 changes: 7 additions & 7 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Laravel-Translatable
====================


[![Total Downloads](https://poser.pugx.org/dimsav/laravel-translatable/downloads.svg)](https://packagist.org/packages/dimsav/laravel-translatable)
[![Build Status](https://circleci.com/gh/dimsav/laravel-translatable.png?style=shield)](https://circleci.com/gh/dimsav/laravel-translatable)
[![Code Coverage](https://scrutinizer-ci.com/g/dimsav/laravel-translatable/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/dimsav/laravel-translatable/?branch=master)
[![Latest Stable Version](http://img.shields.io/packagist/v/dimsav/laravel-translatable.svg)](https://packagist.org/packages/dimsav/laravel-translatable)
[![License](https://poser.pugx.org/dimsav/laravel-translatable/license.svg)](https://packagist.org/packages/dimsav/laravel-translatable)
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/c105358a-3211-47e8-b662-94aa98d1eeee/mini.png)](https://insight.sensiolabs.com/projects/c105358a-3211-47e8-b662-94aa98d1eeee)
[![StyleCI](https://styleci.io/repos/16480576/shield)](https://styleci.io/repos/16480576)
![Total Downloads](https://img.shields.io/packagist/dt/astrotomic/laravel-translatable.svg?style=flat-square)
![Build Status](https://img.shields.io/circleci/build/github/Astrotomic/laravel-translatable/master.svg?style=flat-square)
![Code Quality](https://img.shields.io/scrutinizer/quality/g/Astrotomic/laravel-translatable/master.svg?style=flat-square)
![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/Astrotomic/laravel-translatable/master.svg?style=flat-square)
[![Latest Version](http://img.shields.io/packagist/v/astrotomic/laravel-translatable.svg?style=flat-square)](https://packagist.org/packages/astrotomic/laravel-translatable)
![MIT License](https://img.shields.io/github/license/Astrotomic/laravel-translatable.svg?color=blue&style=flat-square)
[![StyleCI](https://styleci.io/repos/192333549/shield)](https://styleci.io/repos/192333549)

![Laravel Translatable](img/laravel-translatable.png)

Expand Down
2 changes: 1 addition & 1 deletion src/Translatable/Exception/LocalesNotDefinedException.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Exception;
namespace Astrotomic\Translatable\Exception;

class LocalesNotDefinedException extends \Exception
{
Expand Down
4 changes: 2 additions & 2 deletions src/Translatable/Locales.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Dimsav\Translatable;
namespace Astrotomic\Translatable;

use ArrayAccess;
use Illuminate\Contracts\Support\Arrayable;
use Dimsav\Translatable\Exception\LocalesNotDefinedException;
use Illuminate\Contracts\Config\Repository as ConfigContract;
use Astrotomic\Translatable\Exception\LocalesNotDefinedException;
use Illuminate\Contracts\Translation\Translator as TranslatorContract;

class Locales implements Arrayable, ArrayAccess
Expand Down
2 changes: 1 addition & 1 deletion src/Translatable/Translatable.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable;
namespace Astrotomic\Translatable;

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

namespace Dimsav\Translatable;
namespace Astrotomic\Translatable;

use Illuminate\Support\ServiceProvider;

Expand Down
2 changes: 1 addition & 1 deletion tests/LocalesTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Dimsav\Translatable\Locales;
use Astrotomic\Translatable\Locales;

class LocalesTest extends TestsBase
{
Expand Down
4 changes: 2 additions & 2 deletions tests/ScopesTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Dimsav\Translatable\Test\Model\Country;
use Dimsav\Translatable\Test\Model\Vegetable;
use Astrotomic\Translatable\Test\Model\Country;
use Astrotomic\Translatable\Test\Model\Vegetable;

class ScopesTest extends TestsBase
{
Expand Down
24 changes: 12 additions & 12 deletions tests/TestCoreModelExtension.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php

use Dimsav\Translatable\Test\Model;
use Dimsav\Translatable\Test\Model\City;
use Dimsav\Translatable\Test\Model\Company;
use Dimsav\Translatable\Test\Model\Country;
use Dimsav\Translatable\Test\Model\Continent;
use Dimsav\Translatable\Test\Model\Vegetable;
use Dimsav\Translatable\Test\Model\CountryStrict;
use Dimsav\Translatable\Test\Model\CountryGuarded;
use Dimsav\Translatable\Test\Model\CityTranslation;
use Dimsav\Translatable\Test\Model\CountryTranslation;
use Astrotomic\Translatable\Test\Model;
use Astrotomic\Translatable\Test\Model\City;
use Astrotomic\Translatable\Test\Model\Company;
use Astrotomic\Translatable\Test\Model\Country;
use Astrotomic\Translatable\Test\Model\Continent;
use Astrotomic\Translatable\Test\Model\Vegetable;
use Astrotomic\Translatable\Test\Model\CountryStrict;
use Astrotomic\Translatable\Test\Model\CountryGuarded;
use Astrotomic\Translatable\Test\Model\CityTranslation;
use Astrotomic\Translatable\Test\Model\CountryTranslation;

class TestCoreModelExtension extends TestsBase
{
Expand Down Expand Up @@ -63,7 +63,7 @@ public function test_it_returns_false_if_exists_and_dirty_and_parent_save_return
$that = $this;
$event = App::make('events');
$event->listen('eloquent*', function ($event, $models) use ($that) {
return get_class(reset($models)) == 'Dimsav\Translatable\Test\Model\Country' ? false : true;
return get_class(reset($models)) == 'Astrotomic\Translatable\Test\Model\Country' ? false : true;
});

$country = Country::find(1);
Expand All @@ -77,7 +77,7 @@ public function test_it_returns_false_if_does_not_exist_and_parent_save_returns_
$that = $this;
$event = App::make('events');
$event->listen('eloquent*', function ($event, $models) use ($that) {
return get_class(reset($models)) == 'Dimsav\Translatable\Test\Model\Continent' ? false : true;
return get_class(reset($models)) == 'Astrotomic\Translatable\Test\Model\Continent' ? false : true;
});

$continent = new Continent();
Expand Down
4 changes: 2 additions & 2 deletions tests/TestsBase.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Orchestra\Testbench\TestCase;
use Dimsav\Translatable\Test\Model\Country;
use Astrotomic\Translatable\Test\Model\Country;

class TestsBase extends TestCase
{
Expand Down Expand Up @@ -48,7 +48,7 @@ public function testRunningMigration()
protected function getPackageProviders($app)
{
return [
\Dimsav\Translatable\TranslatableServiceProvider::class,
\Astrotomic\Translatable\TranslatableServiceProvider::class,
];
}

Expand Down
22 changes: 11 additions & 11 deletions tests/TranslatableTest.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

use Dimsav\Translatable\Test\Model\Food;
use Dimsav\Translatable\Test\Model\Person;
use Dimsav\Translatable\Test\Model\Country;
use Dimsav\Translatable\Test\Model\CountryStrict;
use Dimsav\Translatable\Test\Model\CountryWithCustomLocaleKey;
use Dimsav\Translatable\Test\Model\CountryWithCustomTranslationModel;
use Astrotomic\Translatable\Test\Model\Food;
use Astrotomic\Translatable\Test\Model\Person;
use Astrotomic\Translatable\Test\Model\Country;
use Astrotomic\Translatable\Test\Model\CountryStrict;
use Astrotomic\Translatable\Test\Model\CountryWithCustomLocaleKey;
use Astrotomic\Translatable\Test\Model\CountryWithCustomTranslationModel;

class TranslatableTest extends TestsBase
{
public function test_it_finds_the_default_translation_class()
{
$country = new Country();
$this->assertEquals(
'Dimsav\Translatable\Test\Model\CountryTranslation',
'Astrotomic\Translatable\Test\Model\CountryTranslation',
$country->getTranslationModelNameDefault());
}

Expand All @@ -31,7 +31,7 @@ public function test_it_finds_the_translation_class_with_suffix_set()
App::make('config')->set('translatable.translation_suffix', 'Trans');
$country = new Country();
$this->assertEquals(
'Dimsav\Translatable\Test\Model\CountryTrans',
'Astrotomic\Translatable\Test\Model\CountryTrans',
$country->getTranslationModelName());
}

Expand Down Expand Up @@ -376,7 +376,7 @@ public function test_getting_translated_field_does_not_create_translation()

public function test_if_locales_are_not_defined_throw_exception()
{
$this->expectException(Dimsav\Translatable\Exception\LocalesNotDefinedException::class);
$this->expectException(Astrotomic\Translatable\Exception\LocalesNotDefinedException::class);

$this->app->config->set('translatable.locales', []);
$this->app->make('translatable.locales')->load();
Expand Down Expand Up @@ -754,12 +754,12 @@ public function test_numeric_translated_attribute()
$this->app->config->set('translatable.fallback_locale', 'de');
$this->app->config->set('translatable.use_fallback', true);

$city = new class extends \Dimsav\Translatable\Test\Model\City {
$city = new class extends \Astrotomic\Translatable\Test\Model\City {
protected $fillable = [
'country_id',
];
protected $table = 'cities';
public $translationModel = \Dimsav\Translatable\Test\Model\CityTranslation::class;
public $translationModel = \Astrotomic\Translatable\Test\Model\CityTranslation::class;
public $translationForeignKey = 'city_id';

protected function isEmptyTranslatableAttribute(string $key, $value): bool
Expand Down
4 changes: 2 additions & 2 deletions tests/models/City.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class City extends Eloquent
Expand Down
2 changes: 1 addition & 1 deletion tests/models/CityTranslation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
2 changes: 1 addition & 1 deletion tests/models/Company.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
4 changes: 2 additions & 2 deletions tests/models/Continent.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/models/ContinentTranslation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
4 changes: 2 additions & 2 deletions tests/models/Country.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class Country extends Eloquent
Expand Down
6 changes: 3 additions & 3 deletions tests/models/CountryGuarded.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class CountryGuarded extends Eloquent
Expand All @@ -15,6 +15,6 @@ class CountryGuarded extends Eloquent

public $translatedAttributes = ['name'];

public $translationModel = 'Dimsav\Translatable\Test\Model\CountryTranslation';
public $translationModel = 'Astrotomic\Translatable\Test\Model\CountryTranslation';
public $translationForeignKey = 'country_id';
}
8 changes: 4 additions & 4 deletions tests/models/CountryStrict.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class CountryStrict extends Eloquent
Expand All @@ -18,11 +18,11 @@ class CountryStrict extends Eloquent

/**
* Here we set a custom model for translation.
* The convention would be Dimsav\Translatable\Test\Model\CountryStrictTranslation.
* The convention would be Astrotomic\Translatable\Test\Model\CountryStrictTranslation.
*
* @var string Class containing the translation
*/
public $translationModel = 'Dimsav\Translatable\Test\Model\StrictTranslation';
public $translationModel = 'Astrotomic\Translatable\Test\Model\StrictTranslation';

/**
* @var string Foreign key for the translation relationship
Expand Down
2 changes: 1 addition & 1 deletion tests/models/CountryTranslation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
2 changes: 1 addition & 1 deletion tests/models/CountryTranslationGuarded.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
4 changes: 2 additions & 2 deletions tests/models/CountryWithCustomLocaleKey.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class CountryWithCustomLocaleKey extends Eloquent
Expand Down
6 changes: 3 additions & 3 deletions tests/models/CountryWithCustomTranslationModel.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;

class CountryWithCustomTranslationModel extends Country
{
use Translatable;

public $table = 'countries';
public $translationForeignKey = 'country_id';
public $translationModel = 'Dimsav\Translatable\Test\Model\CountryTranslation';
public $translationModel = 'Astrotomic\Translatable\Test\Model\CountryTranslation';
}
4 changes: 2 additions & 2 deletions tests/models/Food.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Dimsav\Translatable\Translatable;
use Astrotomic\Translatable\Translatable;
use Illuminate\Database\Eloquent\Model as Eloquent;

class Food extends Eloquent
Expand Down
2 changes: 1 addition & 1 deletion tests/models/FoodTranslation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Dimsav\Translatable\Test\Model;
namespace Astrotomic\Translatable\Test\Model;

use Illuminate\Database\Eloquent\Model as Eloquent;

Expand Down
Loading