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

Update Laravel 11 #142

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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
37 changes: 0 additions & 37 deletions .circleci/config.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ node_modules
Dockerfile
.dokerignore
.gitignore
.gitattributes
.gitattributes
.db
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2

[docker-compose.yml]
indent_size = 4
78 changes: 58 additions & 20 deletions .env.example
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,31 +1,69 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:s8fIxr3u2BvHDMo21mcHluh8y0znrykZ+w+0lZZNqnY=
APP_DEBUG=true
APP_KEY=SomeRandomString
APP_URL=http://www.carpoolear.com.ar
APP_TIMEZONE=UTC
APP_URL=http://localhost

DB_HOST=localhost
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
# APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=mysql
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=carpoolear
DB_USERNAME=root
DB_PASSWORD=holamundo

CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database

MAIL_ENABLED=true
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
CACHE_STORE=database
CACHE_PREFIX=

MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=redis
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=mailpit
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="[email protected]"
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false

API_PREFIX=api
API_VERSION=v1
VITE_APP_NAME="${APP_NAME}"

ANDROID_ENVIRONMENT=production
ANDROID_KEY=apikey
IOS_CERTIFICATE=/path/to/certificate.pem
IOS_ENVIRONMENT=production
IOS_PASSPHRASE=password
SCOUT_DRIVER=meilisearch
MEILISEARCH_HOST=http://meilisearch:7700

FACEBOOK_APP_TOKEN=1234567789
MEILISEARCH_NO_ANALYTICS=false
14 changes: 11 additions & 3 deletions .gitattributes
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
* text=auto
*.css linguist-vendored
*.less linguist-vendored
* text=auto eol=lf

*.blade.php diff=html
*.css diff=css
*.html diff=html
*.md diff=markdown
*.php diff=php

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
34 changes: 22 additions & 12 deletions .gitignore
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
/vendor
/.phpunit.cache
/node_modules
/public/build
/public/hot
/public/storage
/storage/*.key
/vendor
.env
/public/app
/public/image/paths
/public/image/profile
settings.json
.vscode/
cert/*.pem
.idea/*
public/image/docs
app*.sql
worker.log
.db/*
.env.backup
.env.production
.phpactor.json
.phpunit.result.cache
Homestead.json
Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
/.fleet
/.idea
/.vscode
/.zed
.db

storage/firebase.json
39 changes: 0 additions & 39 deletions 000-default.conf

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion app/Console/Commands/AnonymizeUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace STS\Console\Commands;

use STS\User;
use STS\Models\User;
use Illuminate\Console\Command;

/*
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/BuildNodes.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace STS\Console\Commands;

use STS\User;
use STS\Models\User;
use Carbon\Carbon;
use STS\Entities\NodeGeo;
use STS\Models\NodeGeo;
use Illuminate\Console\Command;
use Storage;
use GuzzleHttp\Client;
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/BuildNodesSuburb.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace STS\Console\Commands;

use STS\User;
use STS\Models\User;
use Carbon\Carbon;
use STS\Entities\NodeGeo;
use STS\Models\NodeGeo;
use Illuminate\Console\Command;
use Storage;
use GuzzleHttp\Client;
Expand Down
5 changes: 2 additions & 3 deletions app/Console/Commands/BuildNodesWeights.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
use Carbon\Carbon;
use Illuminate\Console\Command;
use STS\Services\Logic\RoutesManager as RoutesManager;
use STS\Contracts\Repository\Routes as RoutesRepo;
use STS\Entities\Route;
use STS\Entities\NodeGeo;
use STS\Models\Route;
use STS\Models\NodeGeo;
use DB;

class BuildNodesWeights extends Command
Expand Down
5 changes: 2 additions & 3 deletions app/Console/Commands/BuildRoutes.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
use Carbon\Carbon;
use Illuminate\Console\Command;
use STS\Services\Logic\RoutesManager as RoutesManager;
use STS\Contracts\Repository\Routes as RoutesRepo;
use STS\Events\Trip\Create as CreateEvent;
use STS\Entities\Route;
use STS\Entities\Trip;
use STS\Models\Route;
use STS\Models\Trip;

class BuildRoutes extends Command
{
Expand Down
6 changes: 3 additions & 3 deletions app/Console/Commands/CleanTripVisibility.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

use Carbon\Carbon;
use DB;
use STS\Entities\Trip;
use STS\Contracts\Repository\Trip as TripRepo;
use STS\Models\Trip;
use Illuminate\Console\Command;
use STS\Repository\TripRepository;

class CleanTripVisibility extends Command
{
Expand All @@ -32,7 +32,7 @@ class CleanTripVisibility extends Command
*
* @returnactiveRatings void
*/
public function __construct(TripRepo $repo)
public function __construct(TripRepository $repo)
{
$this->tripRepo = $repo;
parent::__construct();
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/ConversationCreate.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace STS\Console\Commands;

use STS\User;
use STS\Models\User;
use Carbon\Carbon;
use STS\Entities\Conversation;
use STS\Models\Conversation;
use Illuminate\Console\Command;
use STS\Services\Logic\ConversationsManager as ConversationManager;

Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/CreateRates.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Carbon\Carbon;
use Illuminate\Console\Command;
use STS\Contracts\Logic\IRateLogic;
use STS\Services\Logic\RatingManager;

class CreateRates extends Command
{
Expand All @@ -29,7 +29,7 @@ class CreateRates extends Command
*
* @returnactiveRatings void
*/
public function __construct(IRateLogic $logic)
public function __construct(RatingManager $logic)
{
parent::__construct();
$this->rateLogic = $logic;
Expand Down
Loading