Skip to content

Commit 0174828

Browse files
authored
Merge pull request #265 from XeroAPI/xero-php-2.11.0
generates from OAS 2.17.4 and fixes guzzle error
2 parents 9a7d8bf + 8da4fdf commit 0174828

29 files changed

+1171
-937
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"ext-json": "*",
2424
"ext-mbstring": "*",
2525
"guzzlehttp/guzzle": "^6.2 | ^7.0",
26-
"guzzlehttp/psr7": "^1.8",
2726
"league/oauth2-client": "^2.5.0",
2827
"firebase/php-jwt": "^5.0"
2928
},

docs/v2/accounting/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5983,7 +5983,7 @@
59835983
<nav id="scrollingNav">
59845984
<ul class="sidenav nav nav-list">
59855985
<li class="nav-header" data-group="Accounting"><strong>SDK: </strong><span id='sdk-name'></span></li>
5986-
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>2.10.0</li>
5986+
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>2.11.0</li>
59875987
<li class="nav-header" data-group="Accounting"><a href="#api-Accounting">Methods</a></li>
59885988
<li data-group="Accounting" data-name="createAccount" class="">
59895989
<a href="#api-Accounting-createAccount">createAccount</a>

docs/v2/appstore/index.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -878,8 +878,8 @@
878878
},
879879
"status" : {
880880
"type" : "string",
881-
"description" : "Status of the plan. Available statuses are ACTIVE,\nPENDING_ACTIVATION.\n",
882-
"enum" : [ "ACTIVE", "PENDING_ACTIVATION" ]
881+
"description" : "Status of the plan. Available statuses are ACTIVE, CANCELED, and\nPENDING_ACTIVATION.\n",
882+
"enum" : [ "ACTIVE", "CANCELED", "PENDING_ACTIVATION" ]
883883
},
884884
"subscriptionItems" : {
885885
"type" : "array",
@@ -1002,7 +1002,8 @@
10021002
},
10031003
"status" : {
10041004
"type" : "string",
1005-
"description" : "Status of the subscription. Available statuses are ACTIVE, CANCELED, and PAST_DUE."
1005+
"description" : "Status of the subscription. Available statuses are ACTIVE, CANCELED, and PAST_DUE.",
1006+
"enum" : [ "ACTIVE", "CANCELED", "PAST_DUE" ]
10061007
},
10071008
"testMode" : {
10081009
"type" : "boolean",
@@ -1013,7 +1014,7 @@
10131014
};
10141015
defs["SubscriptionItem"] = {
10151016
"title" : "",
1016-
"required" : [ "id", "price", "product", "startDate" ],
1017+
"required" : [ "id", "price", "product", "startDate", "status" ],
10171018
"type" : "object",
10181019
"properties" : {
10191020
"endDate" : {
@@ -1037,6 +1038,11 @@
10371038
"description" : "Date the subscription started, or will start. Note: this could be in\nthe future for downgrades or reduced number of seats that haven't taken effect yet.\n",
10381039
"format" : "date-time"
10391040
},
1041+
"status" : {
1042+
"type" : "string",
1043+
"description" : "Status of the subscription item. Available statuses are ACTIVE, CANCELED, and\nPENDING_ACTIVATION.\n",
1044+
"enum" : [ "ACTIVE", "CANCELED", "PENDING_ACTIVATION" ]
1045+
},
10401046
"testMode" : {
10411047
"type" : "boolean",
10421048
"description" : "If the subscription is a test subscription"
@@ -1126,7 +1132,7 @@
11261132
<nav id="scrollingNav">
11271133
<ul class="sidenav nav nav-list">
11281134
<li class="nav-header" data-group="AppStore"><strong>SDK: </strong><span id='sdk-name'></span></li>
1129-
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>2.10.0</li>
1135+
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>2.11.0</li>
11301136
<li class="nav-header" data-group="AppStore"><a href="#api-AppStore">Methods</a></li>
11311137
<li data-group="AppStore" data-name="getSubscription" class="">
11321138
<a href="#api-AppStore-getSubscription">getSubscription</a>

docs/v2/assets/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@
13901390
<nav id="scrollingNav">
13911391
<ul class="sidenav nav nav-list">
13921392
<li class="nav-header" data-group="Asset"><strong>SDK: </strong><span id='sdk-name'></span></li>
1393-
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>2.10.0</li>
1393+
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>2.11.0</li>
13941394
<li class="nav-header" data-group="Asset"><a href="#api-Asset">Methods</a></li>
13951395
<li data-group="Asset" data-name="createAsset" class="">
13961396
<a href="#api-Asset-createAsset">createAsset</a>

docs/v2/files/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,13 +1008,13 @@
10081008
"title" : "",
10091009
"type" : "string",
10101010
"description" : "The Object Group that the object is in. These roughly correlate to the endpoints that can be used to retrieve the object via the core accounting API.",
1011-
"enum" : [ "Account", "BankTransaction", "Contact", "CreditNote", "Invoice", "Item", "ManualJournal", "Overpayment", "Payment", "Prepayment", "Receipt" ]
1011+
"enum" : [ "Account", "BankTransaction", "Contact", "CreditNote", "Invoice", "Item", "ManualJournal", "Overpayment", "Payment", "Prepayment", "Quote", "Receipt" ]
10121012
};
10131013
defs["ObjectType"] = {
10141014
"title" : "",
10151015
"type" : "string",
10161016
"description" : "The Object Type",
1017-
"enum" : [ "Unknown", "Accpay", "AccPayCredit", "AccPayPayment", "AccRec", "AccRecCredit", "AccRecPayment", "Adjustment", "ApCreditPayment", "ApOverPayment", "ApOverPaymentPayment", "ApOverPaymentSourcePayment", "ApPrepayment", "ApPrepaymentPayment", "ApPrepaymentSourcePayment", "ArCreditPayment", "ArOverPayment", "ArOverpaymentPayment", "ArOverpaymentSourcePayment", "ArPrepayment", "ArPrepaymentPayment", "ArPrepaymentSourcePayment", "CashPaid", "CashRec", "ExpPayment", "ManJournal", "PurchaseOrder", "Receipt", "Transfer", "Account", "Contact", "Business", "Employee", "Person", "User", "Org", "FixedAsset", "PayRun", "PriceListItem", "Bank", "Current", "Equity", "Expense", "Fixed", "Liability", "Prepayment", "Revenue", "Sales", "Overheads", "Depreciatn", "OtherIncome", "DirectCosts", "Currliab", "Termliab", "NonCurrent" ]
1017+
"enum" : [ "Unknown", "Accpay", "AccPayCredit", "AccPayPayment", "AccRec", "AccRecCredit", "AccRecPayment", "Adjustment", "ApCreditPayment", "ApOverPayment", "ApOverPaymentPayment", "ApOverPaymentSourcePayment", "ApPrepayment", "ApPrepaymentPayment", "ApPrepaymentSourcePayment", "ArCreditPayment", "ArOverPayment", "ArOverpaymentPayment", "ArOverpaymentSourcePayment", "ArPrepayment", "ArPrepaymentPayment", "ArPrepaymentSourcePayment", "CashPaid", "CashRec", "ExpPayment", "ManJournal", "PurchaseOrder", "Receipt", "Transfer", "Account", "Contact", "Business", "Employee", "Person", "User", "Org", "FixedAsset", "PayRun", "PriceListItem", "Bank", "Current", "Equity", "Expense", "Fixed", "Liability", "Prepayment", "Revenue", "Sales", "Overheads", "Depreciatn", "OtherIncome", "DirectCosts", "Currliab", "Termliab", "NonCurrent", "SalesQuote" ]
10181018
};
10191019
defs["UploadObject"] = {
10201020
"title" : "",
@@ -1154,7 +1154,7 @@
11541154
<nav id="scrollingNav">
11551155
<ul class="sidenav nav nav-list">
11561156
<li class="nav-header" data-group="Files"><strong>SDK: </strong><span id='sdk-name'></span></li>
1157-
<li class="nav-header" data-group="Files"><strong>VSN: </strong>2.10.0</li>
1157+
<li class="nav-header" data-group="Files"><strong>VSN: </strong>2.11.0</li>
11581158
<li class="nav-header" data-group="Files"><a href="#api-Files">Methods</a></li>
11591159
<li data-group="Files" data-name="createFileAssociation" class="">
11601160
<a href="#api-Files-createFileAssociation">createFileAssociation</a>

docs/v2/finance/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2316,7 +2316,7 @@
23162316
<nav id="scrollingNav">
23172317
<ul class="sidenav nav nav-list">
23182318
<li class="nav-header" data-group="Finance"><strong>SDK: </strong><span id='sdk-name'></span></li>
2319-
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>2.10.0</li>
2319+
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>2.11.0</li>
23202320
<li class="nav-header" data-group="Finance"><a href="#api-Finance">Methods</a></li>
23212321
<li data-group="Finance" data-name="getAccountingActivityAccountUsage" class="">
23222322
<a href="#api-Finance-getAccountingActivityAccountUsage">getAccountingActivityAccountUsage</a>

docs/v2/payroll_au/index.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,12 +916,18 @@
916916
"type" : "string",
917917
"description" : "See Account Types",
918918
"enum" : [ "BANK", "CURRENT", "CURRLIAB", "DEPRECIATN", "DIRECTCOSTS", "EQUITY", "EXPENSE", "FIXED", "INVENTORY", "LIABILITY", "NONCURRENT", "OTHERINCOME", "OVERHEADS", "PREPAYMENT", "REVENUE", "SALES", "TERMLIAB", "PAYGLIABILITY", "PAYG", "SUPERANNUATIONEXPENSE", "SUPERANNUATIONLIABILITY", "WAGESEXPENSE", "WAGESPAYABLELIABILITY" ]
919+
};
920+
defs["AllowanceCategory"] = {
921+
"title" : "",
922+
"type" : "string",
923+
"description" : "",
924+
"enum" : [ "NONDEDUCTIBLE", "UNIFORM", "PRIVATEVEHICLE", "HOMEOFFICE", "TRANSPORT", "GENERAL", "OTHER" ]
919925
};
920926
defs["AllowanceType"] = {
921927
"title" : "",
922928
"type" : "string",
923929
"description" : "",
924-
"enum" : [ "CAR", "TRANSPORT", "TRAVEL", "LAUNDRY", "MEALS", "JOBKEEPER", "OTHER" ]
930+
"enum" : [ "CAR", "TRANSPORT", "LAUNDRY", "MEALS", "TRAVEL", "OTHER", "JOBKEEPER", "TOOLS", "TASKS", "QUALIFICATIONS" ]
925931
};
926932
defs["BankAccount"] = {
927933
"title" : "",
@@ -1222,6 +1228,9 @@
12221228
},
12231229
"AllowanceType" : {
12241230
"$ref" : "#/components/schemas/AllowanceType"
1231+
},
1232+
"AllowanceCategory" : {
1233+
"$ref" : "#/components/schemas/AllowanceCategory"
12251234
}
12261235
},
12271236
"description" : ""
@@ -3244,7 +3253,7 @@
32443253
<nav id="scrollingNav">
32453254
<ul class="sidenav nav nav-list">
32463255
<li class="nav-header" data-group="PayrollAu"><strong>SDK: </strong><span id='sdk-name'></span></li>
3247-
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>2.10.0</li>
3256+
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>2.11.0</li>
32483257
<li class="nav-header" data-group="PayrollAu"><a href="#api-PayrollAu">Methods</a></li>
32493258
<li data-group="PayrollAu" data-name="createEmployee" class="">
32503259
<a href="#api-PayrollAu-createEmployee">createEmployee</a>

docs/v2/payroll_nz/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3837,7 +3837,7 @@
38373837
<nav id="scrollingNav">
38383838
<ul class="sidenav nav nav-list">
38393839
<li class="nav-header" data-group="PayrollNz"><strong>SDK: </strong><span id='sdk-name'></span></li>
3840-
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>2.10.0</li>
3840+
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>2.11.0</li>
38413841
<li class="nav-header" data-group="PayrollNz"><a href="#api-PayrollNz">Methods</a></li>
38423842
<li data-group="PayrollNz" data-name="approveTimesheet" class="">
38433843
<a href="#api-PayrollNz-approveTimesheet">approveTimesheet</a>

docs/v2/payroll_uk/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3505,7 +3505,7 @@
35053505
<nav id="scrollingNav">
35063506
<ul class="sidenav nav nav-list">
35073507
<li class="nav-header" data-group="PayrollUk"><strong>SDK: </strong><span id='sdk-name'></span></li>
3508-
<li class="nav-header" data-group="PayrollUk"><strong>VSN: </strong>2.10.0</li>
3508+
<li class="nav-header" data-group="PayrollUk"><strong>VSN: </strong>2.11.0</li>
35093509
<li class="nav-header" data-group="PayrollUk"><a href="#api-PayrollUk">Methods</a></li>
35103510
<li data-group="PayrollUk" data-name="approveTimesheet" class="">
35113511
<a href="#api-PayrollUk-approveTimesheet">approveTimesheet</a>

docs/v2/projects/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@
14671467
<nav id="scrollingNav">
14681468
<ul class="sidenav nav nav-list">
14691469
<li class="nav-header" data-group="Project"><strong>SDK: </strong><span id='sdk-name'></span></li>
1470-
<li class="nav-header" data-group="Project"><strong>VSN: </strong>2.10.0</li>
1470+
<li class="nav-header" data-group="Project"><strong>VSN: </strong>2.11.0</li>
14711471
<li class="nav-header" data-group="Project"><a href="#api-Project">Methods</a></li>
14721472
<li data-group="Project" data-name="createProject" class="">
14731473
<a href="#api-Project-createProject">createProject</a>

0 commit comments

Comments
 (0)