mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 06:37:33 -05:00 
			
		
		
		
	Merge pull request #4746 from turbo124/master
Update Framework Dependencies
This commit is contained in:
		
						commit
						53e3b9a940
					
				@ -28,8 +28,8 @@
 | 
				
			|||||||
        "cerdic/css-tidy": "~v1.5",
 | 
					        "cerdic/css-tidy": "~v1.5",
 | 
				
			||||||
        "chumper/datatable": "dev-add-back-options",
 | 
					        "chumper/datatable": "dev-add-back-options",
 | 
				
			||||||
        "cleverit/ubl_invoice": "1.*",
 | 
					        "cleverit/ubl_invoice": "1.*",
 | 
				
			||||||
        "codedge/laravel-selfupdater": "5.x-dev",
 | 
					        "codedge/laravel-selfupdater": "2.2.0",
 | 
				
			||||||
        "collizo4sky/omnipay-wepay": "dev-address-fix",
 | 
					        "collizo4sky/omnipay-wepay": "dev-address-fix#942f3e0",
 | 
				
			||||||
        "digitickets/omnipay-gocardlessv2": "dev-payment-fix",
 | 
					        "digitickets/omnipay-gocardlessv2": "dev-payment-fix",
 | 
				
			||||||
        "doctrine/dbal": "2.5.x",
 | 
					        "doctrine/dbal": "2.5.x",
 | 
				
			||||||
        "dompdf/dompdf": "0.6.2",
 | 
					        "dompdf/dompdf": "0.6.2",
 | 
				
			||||||
@ -38,12 +38,11 @@
 | 
				
			|||||||
        "google/apiclient": "^2.0",
 | 
					        "google/apiclient": "^2.0",
 | 
				
			||||||
        "guzzlehttp/guzzle": "^6.3",
 | 
					        "guzzlehttp/guzzle": "^6.3",
 | 
				
			||||||
        "intervention/image": "dev-master",
 | 
					        "intervention/image": "dev-master",
 | 
				
			||||||
        "invoiceninja/omnipay-collection": "^0.10.0",
 | 
					 | 
				
			||||||
        "jaybizzle/laravel-crawler-detect": "1.*",
 | 
					        "jaybizzle/laravel-crawler-detect": "1.*",
 | 
				
			||||||
        "jlapp/swaggervel": "master-dev",
 | 
					        "jlapp/swaggervel": "master-dev",
 | 
				
			||||||
        "jonnyw/php-phantomjs": "dev-fixes",
 | 
					        "jonnyw/php-phantomjs": "dev-fixes",
 | 
				
			||||||
        "laracasts/presenter": "dev-master",
 | 
					        "laracasts/presenter": "dev-master",
 | 
				
			||||||
        "laravel/framework": "5.5.*",
 | 
					        "turbo124/framework": "5.5.51",
 | 
				
			||||||
        "laravel/legacy-encrypter": "^1.0",
 | 
					        "laravel/legacy-encrypter": "^1.0",
 | 
				
			||||||
        "laravel/socialite": "3.0.x-dev",
 | 
					        "laravel/socialite": "3.0.x-dev",
 | 
				
			||||||
        "laravel/tinker": "^1.0",
 | 
					        "laravel/tinker": "^1.0",
 | 
				
			||||||
@ -59,11 +58,9 @@
 | 
				
			|||||||
        "nwidart/laravel-modules": "2.0.*",
 | 
					        "nwidart/laravel-modules": "2.0.*",
 | 
				
			||||||
        "omnipay/authorizenet": "dev-solution-id as 2.5.0",
 | 
					        "omnipay/authorizenet": "dev-solution-id as 2.5.0",
 | 
				
			||||||
        "omnipay/firstdata": "^2.4",
 | 
					        "omnipay/firstdata": "^2.4",
 | 
				
			||||||
        "omnipay/payfast": "dev-master",
 | 
					 | 
				
			||||||
        "patricktalmadge/bootstrapper": "5.5.x",
 | 
					        "patricktalmadge/bootstrapper": "5.5.x",
 | 
				
			||||||
        "pragmarx/google2fa-laravel": "^0.1.2",
 | 
					        "turbo124/google2fa-laravel": "0.1.2",
 | 
				
			||||||
        "predis/predis": "^1.1",
 | 
					        "predis/predis": "^1.1",
 | 
				
			||||||
        "roave/security-advisories": "dev-master",
 | 
					 | 
				
			||||||
        "simshaun/recurr": "dev-master",
 | 
					        "simshaun/recurr": "dev-master",
 | 
				
			||||||
        "stripe/stripe-php": "^6.40",
 | 
					        "stripe/stripe-php": "^6.40",
 | 
				
			||||||
        "symfony/css-selector": "~3.1",
 | 
					        "symfony/css-selector": "~3.1",
 | 
				
			||||||
@ -71,7 +68,35 @@
 | 
				
			|||||||
        "webpatser/laravel-countries": "dev-master#75992ad",
 | 
					        "webpatser/laravel-countries": "dev-master#75992ad",
 | 
				
			||||||
        "websight/l5-google-cloud-storage": "dev-master",
 | 
					        "websight/l5-google-cloud-storage": "dev-master",
 | 
				
			||||||
        "wepay/php-sdk": "^0.2",
 | 
					        "wepay/php-sdk": "^0.2",
 | 
				
			||||||
        "wildbit/postmark-php": "^2.5"
 | 
					        "wildbit/postmark-php": "^2.5",
 | 
				
			||||||
 | 
					        "abdala/omnipay-pagseguro": "0.2",
 | 
				
			||||||
 | 
					        "agmscode/omnipay-agms": "~1.0",
 | 
				
			||||||
 | 
					        "andreas22/omnipay-fasapay": "1.*",
 | 
				
			||||||
 | 
					        "bramdevries/omnipay-paymill": "^1.0",
 | 
				
			||||||
 | 
					        "cardgate/omnipay-cardgate": "~2.0",
 | 
				
			||||||
 | 
					        "delatbabel/omnipay-fatzebra": "dev-master",
 | 
				
			||||||
 | 
					        "dercoder/omnipay-ecopayz": "~1.0",
 | 
				
			||||||
 | 
					        "dercoder/omnipay-paysafecard": "dev-master",
 | 
				
			||||||
 | 
					        "digitickets/omnipay-barclays-epdq": "~3.0",
 | 
				
			||||||
 | 
					        "digitickets/omnipay-datacash": "~3.0",
 | 
				
			||||||
 | 
					        "digitickets/omnipay-realex": "~5.0",
 | 
				
			||||||
 | 
					        "fotografde/omnipay-checkoutcom": "~2.0",
 | 
				
			||||||
 | 
					        "fruitcakestudio/omnipay-sisow": "~2.0",
 | 
				
			||||||
 | 
					        "justinbusschau/omnipay-secpay": "~2.0",
 | 
				
			||||||
 | 
					        "lokielse/omnipay-alipay": "~1.4",
 | 
				
			||||||
 | 
					        "meebio/omnipay-creditcall": "dev-master",
 | 
				
			||||||
 | 
					        "meebio/omnipay-secure-trading": "dev-master",
 | 
				
			||||||
 | 
					        "mfauveau/omnipay-pacnet": "~2.0",
 | 
				
			||||||
 | 
					        "omnipay/bitpay": "dev-master",
 | 
				
			||||||
 | 
					        "omnipay/braintree": "^1.1",
 | 
				
			||||||
 | 
					        "omnipay/gocardless": "dev-master",
 | 
				
			||||||
 | 
					        "omnipay/mollie": "3.*",
 | 
				
			||||||
 | 
					        "omnipay/omnipay": "~2.3",
 | 
				
			||||||
 | 
					        "omnipay/payfast": "~2.0",
 | 
				
			||||||
 | 
					        "omnipay/stripe": "~2.0",
 | 
				
			||||||
 | 
					        "softcommerce/omnipay-paytrace": "~1.0",
 | 
				
			||||||
 | 
					        "vink/omnipay-komoju": "~1.0",
 | 
				
			||||||
 | 
					        "omnipay/common": "2.5.2"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "require-dev": {
 | 
					    "require-dev": {
 | 
				
			||||||
        "symfony/dom-crawler": "~3.1",
 | 
					        "symfony/dom-crawler": "~3.1",
 | 
				
			||||||
@ -158,6 +183,10 @@
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            "type": "vcs",
 | 
					            "type": "vcs",
 | 
				
			||||||
            "url": "https://github.com/davidbankes/omnipay-firstdata.git"
 | 
					            "url": "https://github.com/davidbankes/omnipay-firstdata.git"
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            "type": "vcs",
 | 
				
			||||||
 | 
					            "url": "https://github.com/hillelcoren/omnipay-authorizenet"  
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										5031
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5031
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					use App\Models\Gateway;
 | 
				
			||||||
 | 
					use Illuminate\Database\Migrations\Migration;
 | 
				
			||||||
 | 
					use Illuminate\Database\Schema\Blueprint;
 | 
				
			||||||
 | 
					use Illuminate\Support\Facades\Schema;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class RemoveCyberSourceGateway extends Migration
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Run the migrations.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return void
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public function up()
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /* No longer supported for V2 Omnipay */
 | 
				
			||||||
 | 
					        $cyber = Gateway::where('provider', 'Cybersource')->first();
 | 
				
			||||||
 | 
					        $cyber->payment_library_id = 2;
 | 
				
			||||||
 | 
					        $cyber->save();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Reverse the migrations.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return void
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public function down()
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        //
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user