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

Jump to bottom

Allow falsy ID for plans #68

Merged
merged 4 commits into from May 21, 2014
Merged

Allow falsy ID for plans #68

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b41f542
Allow falsy ID for plans
KorvinSzanto Dec 20, 2013
effab39
Add test for plan, allow falsy id in request, add composer.phar to .g…
KorvinSzanto Jan 23, 2014
d4b4773
Revert weird changes
KorvinSzanto Mar 11, 2014
35dd927
Update changed files to kind of follow zend style guide.
KorvinSzanto Mar 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -8,4 +8,5 @@
/vendor/

# If the vendor directory isn't being commited the composer.lock file should also be ignored
composer.lock
composer.lock
composer.phar
2 changes: 1 addition & 1 deletion lib/Stripe/ApiResource.php
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ public function instanceUrl()
{
$id = $this['id'];
$class = get_class($this);
if (!$id) {
if ($id === null) {
throw new Stripe_InvalidRequestError("Could not determine which URL to request: $class instance has invalid ID: $id", null);
}
$id = Stripe_ApiRequestor::utf8($id);
Expand Down
2 changes: 1 addition & 1 deletion lib/Stripe/Object.php
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ public function __construct($id=null, $apiKey=null)
$id = $id['id'];
}

if ($id)
if ($id !== null)
$this->id = $id;
}

Expand Down
20 changes: 0 additions & 20 deletions test/Stripe.php
View file
Open in desktop
Expand Up @@ -33,24 +33,4 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
require_once(dirname(__FILE__) . '/../lib/Stripe.php');

require_once(dirname(__FILE__) . '/Stripe/TestCase.php');

require_once(dirname(__FILE__) . '/Stripe/ApiRequestorTest.php');
require_once(dirname(__FILE__) . '/Stripe/AuthenticationErrorTest.php');
require_once(dirname(__FILE__) . '/Stripe/CardErrorTest.php');
require_once(dirname(__FILE__) . '/Stripe/AccountTest.php');
require_once(dirname(__FILE__) . '/Stripe/BalanceTest.php');
require_once(dirname(__FILE__) . '/Stripe/BalanceTransactionTest.php');
require_once(dirname(__FILE__) . '/Stripe/ChargeTest.php');
require_once(dirname(__FILE__) . '/Stripe/CouponTest.php');
require_once(dirname(__FILE__) . '/Stripe/CustomerTest.php');
require_once(dirname(__FILE__) . '/Stripe/DiscountTest.php');
require_once(dirname(__FILE__) . '/Stripe/Error.php');
require_once(dirname(__FILE__) . '/Stripe/InvalidRequestErrorTest.php');
require_once(dirname(__FILE__) . '/Stripe/InvoiceTest.php');
require_once(dirname(__FILE__) . '/Stripe/ObjectTest.php');
require_once(dirname(__FILE__) . '/Stripe/PlanTest.php');
require_once(dirname(__FILE__) . '/Stripe/Token.php');
require_once(dirname(__FILE__) . '/Stripe/TransferTest.php');
require_once(dirname(__FILE__) . '/Stripe/RecipientTest.php');
require_once(dirname(__FILE__) . '/Stripe/ApplicationFeeTest.php');
require_once(dirname(__FILE__) . '/Stripe/UtilTest.php');
15 changes: 15 additions & 0 deletions test/Stripe/PlanTest.php
View file
Open in desktop
Expand Up @@ -14,6 +14,21 @@ public function testDeletion()
$this->assertTrue($p->deleted);
}

public function testId()
{
authorizeFromEnv();
$p = Stripe_Plan::create(array('amount' => 2000,
'interval' => 'month',
'currency' => 'usd',
'name' => 'Plan',
'id' => '0'));
$p2 = Stripe_Plan::retrieve('0');

$this->assertEqual($p->id, $p2->id);
$this->assertEqual($p->id, '0');
$p->delete();
}

public function testSave()
{
authorizeFromEnv();
Expand Down