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

Integrate fzaninotto/Faker using composer #41

Merged
merged 1 commit into from
Nov 2, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tests/ export-ignore
.gitignore export-ignore
.gitattributes export-ignore
.travis.yml export-ignore
composer.json export-ignore
composer.lock export-ignore
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
.idea
.idea
vendor/fzaninotto/faker/test/
vendor/fzaninotto/faker/.git*
vendor/fzaninotto/faker/.travis.yml
vendor/fzaninotto/faker/*.md
vendor/fzaninotto/faker/Makefile
vendor/fzaninotto/faker/phpunit.xml.dist
2 changes: 1 addition & 1 deletion Faker/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;

include_once __DIR__ . '/../libs/Faker/autoload.php';
include_once __DIR__ . '/../vendor/autoload.php';

class Request extends \Faker\Provider\Base
{
Expand Down
2 changes: 1 addition & 1 deletion Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

use Piwik\SettingsPiwik;

include_once __DIR__ . '/libs/Faker/autoload.php';
include_once __DIR__ . '/vendor/autoload.php';

class Generator
{
Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require": {
"fzaninotto/faker": "dev-master"
}
}
70 changes: 70 additions & 0 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

188 changes: 0 additions & 188 deletions libs/Faker/Faker/Generator.php

This file was deleted.

62 changes: 0 additions & 62 deletions libs/Faker/Faker/Guesser/Name.php

This file was deleted.

22 changes: 0 additions & 22 deletions libs/Faker/Faker/NullGenerator.php

This file was deleted.

Loading